Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

107 pass data through metamorph else #333

Merged
merged 7 commits into from
Oct 13, 2020
Merged

107 pass data through metamorph else #333

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ad48cd4
Harden MarcXmlEncoder
dr0i Oct 8, 2020
f009e28
Allow to pass data through metamorph
dr0i Oct 8, 2020
758327d
Check if it's an entity before handling an entity
dr0i Oct 9, 2020
59c516d
Implement comments
dr0i Oct 12, 2020
576c5ad
Implement comment
dr0i Oct 12, 2020
5f1ef8f
Implement comment
dr0i Oct 12, 2020
113ce50
Add missing dependency declarations. (5f1ef8f)
blackwinter Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion metafacture-biblio/src/main/java/org/metafacture/biblio/marc21/MarcXmlEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,8 @@ public void literal(final String name, final String value) {
if (currentEntity.equals("")) {
prettyPrintIndentation();
writeRaw(String.format(CONTROLFIELD_OPEN_TEMPLATE, name));
writeEscaped(value.trim());
if (value!=null)
blackwinter marked this conversation as resolved.
Show resolved Hide resolved
writeEscaped(value.trim());
writeRaw(CONTROLFIELD_CLOSE);
prettyPrintNewLine();
} else if (!currentEntity.equals(Marc21EventNames.LEADER_ENTITY)) {
Expand Down
41 changes: 25 additions & 16 deletions metamorph/src/main/java/org/metafacture/metamorph/Metamorph.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;

import org.metafacture.commons.ResourceUtil;
import org.metafacture.framework.FluxCommand;
Expand Down Expand Up @@ -64,6 +65,7 @@
@FluxCommand("morph")
public final class Metamorph implements StreamPipe<StreamReceiver>, NamedValuePipe, Maps {

private static final String ELSE_AND_PASS_ENTITY_EVENTS_KEYWORD = "_elseAndPassEntityEvents";
blackwinter marked this conversation as resolved.
Show resolved Hide resolved
public static final String ELSE_KEYWORD = "_else";
public static final char FEEDBACK_CHAR = '@';
public static final char ESCAPE_CHAR = '\\';
Expand Down Expand Up @@ -94,6 +96,8 @@ public final class Metamorph implements StreamPipe<StreamReceiver>, NamedValuePi
private MorphErrorHandler errorHandler = new DefaultErrorHandler();
private int recordCount;
private final List<FlushListener> recordEndListener = new ArrayList<>();
private boolean passEntityEvents;
final private Pattern literalPatternOfEntityMarker = Pattern.compile(flattener.getEntityMarker(), Pattern.LITERAL);

protected Metamorph() {
// package private
Expand Down Expand Up @@ -215,7 +219,10 @@ public void setErrorHandler(final MorphErrorHandler errorHandler) {
}

protected void registerNamedValueReceiver(final String source, final NamedValueReceiver data) {
if (ELSE_KEYWORD.equals(source)) {
if (ELSE_AND_PASS_ENTITY_EVENTS_KEYWORD.equals(source)) {
this.passEntityEvents = true;
blackwinter marked this conversation as resolved.
Show resolved Hide resolved
}
if (ELSE_KEYWORD.equals(source) || this.passEntityEvents) {
elseSources.add(data);
} else {
dataRegistry.register(source, data);
Expand Down Expand Up @@ -268,9 +275,6 @@ public void startEntity(final String name) {
entityCountStack.push(Integer.valueOf(entityCount));

flattener.startEntity(name);



}

@Override
Expand Down Expand Up @@ -306,28 +310,33 @@ public void closeStream() {
outputStreamReceiver.closeStream();
}

protected void dispatch(final String path, final String value, final List<NamedValueReceiver> fallback) {
final List<NamedValueReceiver> matchingData = findMatchingData(path, fallback);
if (null != matchingData) {
send(path, value, matchingData);
}
}

private List<NamedValueReceiver> findMatchingData(final String path, final List<NamedValueReceiver> fallback) {
final List<NamedValueReceiver> matchingData = dataRegistry.get(path);
protected void dispatch(final String path, final String value, final List<NamedValueReceiver> fallbackReceiver) {
List<NamedValueReceiver> matchingData = dataRegistry.get(path);
boolean fallback = false;
if (matchingData == null || matchingData.isEmpty()) {
return fallback;
fallback = true;
matchingData = fallbackReceiver;
}
if (null != matchingData) {
send(path, value, matchingData, fallback);
}
return matchingData;
}

private void send(final String key, final String value, final List<NamedValueReceiver> dataList) {
private void send(final String path, final String value, final List<NamedValueReceiver> dataList, final boolean fallback) {
for (final NamedValueReceiver data : dataList) {
String key=path;
if (fallback && value != null && passEntityEvents) {
outputStreamReceiver.startEntity(flattener.getCurrentEntityName());
key=literalPatternOfEntityMarker.split(path)[1];
}
try {
data.receive(key, value, null, recordCount, currentEntityCount);
} catch (final RuntimeException e) {
errorHandler.error(e);
}
if (fallback && value!=null && passEntityEvents) {
outputStreamReceiver.endEntity();
}
}
}

Expand Down
58 changes: 58 additions & 0 deletions metamorph/src/test/java/org/metafacture/metamorph/MetamorphTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;

Expand All @@ -33,6 +34,7 @@
import org.metafacture.framework.helpers.DefaultStreamReceiver;
import org.metafacture.metamorph.api.Maps;
import org.metafacture.metamorph.api.NamedValueReceiver;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
Expand All @@ -52,6 +54,9 @@ public final class MetamorphTest {
@Mock
private NamedValueReceiver namedValueReceiver;

@Mock
private DefaultStreamReceiver receiver = new DefaultStreamReceiver();

private Metamorph metamorph;

@Before
Expand All @@ -60,6 +65,7 @@ public void createSystemUnderTest() {
metamorph.setReceiver(new DefaultStreamReceiver());
}


@Test
public void shouldMapMatchingPath() {
setupSimpleMappingMorph();
Expand Down Expand Up @@ -189,4 +195,56 @@ public void shouldThrowIllegalStateExceptionIfEntityIsNotClosed() {
metamorph.endRecord(); // Exception expected
}

@Test
public void metamorph1() {
blackwinter marked this conversation as resolved.
Show resolved Hide resolved
metamorph = InlineMorph.in(this) //
.with("<rules>") //
.with(" <data source='_else'/>")//
.with("</rules>")//
.createConnectedTo(receiver);

metamorph.startRecord("1");
metamorph.startEntity("clone");
metamorph.literal("id", "0");
metamorph.endEntity();
metamorph.startEntity("clone");
metamorph.literal("id", "1");
metamorph.endEntity();
metamorph.endRecord();

final InOrder ordered = inOrder(receiver);
ordered.verify(receiver).startRecord("1");
ordered.verify(receiver).literal("clone.id", "0");
ordered.verify(receiver).literal("clone.id", "1");
ordered.verify(receiver).endRecord();
}

@Test
public void metamorph1_1() {
blackwinter marked this conversation as resolved.
Show resolved Hide resolved
metamorph = InlineMorph.in(this).with("<meta>") //
dr0i marked this conversation as resolved.
Show resolved Hide resolved
.with("</meta>")//
.with("<rules>")//
.with(" <data source='_elseAndPassEntityEvents' />")//
.with("</rules>")//
.createConnectedTo(receiver);

metamorph.startRecord("1");
blackwinter marked this conversation as resolved.
Show resolved Hide resolved
metamorph.startEntity("clone");
metamorph.literal("id", "0");
metamorph.endEntity();
metamorph.startEntity("clone");
metamorph.literal("id", "1");
metamorph.endEntity();
metamorph.endRecord();

final InOrder ordered = inOrder(receiver);
ordered.verify(receiver).startRecord("1");
blackwinter marked this conversation as resolved.
Show resolved Hide resolved
ordered.verify(receiver).startEntity("clone");
ordered.verify(receiver).literal("id", "0");
ordered.verify(receiver).endEntity();
ordered.verify(receiver).startEntity("clone");
ordered.verify(receiver).literal("id", "1");
ordered.verify(receiver).endEntity();
ordered.verify(receiver).endRecord();
}
}