Skip to content

Commit 29afea1

Browse files
author
mgeipel
committed
fixed issue #27
1 parent 8fdc944 commit 29afea1

File tree

7 files changed

+30
-28
lines changed

7 files changed

+30
-28
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<groupId>junit</groupId>
144144
<artifactId>junit</artifactId>
145145
<version>${junit.version}</version>
146-
<scope>test</scope>
146+
<scope>compile</scope>
147147
</dependency>
148148

149149
<dependency>

src/main/java/org/culturegraph/mf/framework/DefaultSender.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
*/
3232
public class DefaultSender<T extends LifeCycle> implements Sender<T> {
3333

34-
private T receiver;
34+
private T receiver;
35+
3536

3637
@Override
3738
public final <R extends T> R setReceiver(final R receiver) {

src/main/java/org/culturegraph/mf/morph/collectors/Tuples.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void setSeparator(final String separator) {
5252

5353
@Override
5454
protected void receive(final String name, final String value, final NamedValueSource source) {
55-
listMap.put(name, value);
55+
listMap.add(name, value);
5656
}
5757

5858
@Override

src/main/java/org/culturegraph/mf/stream/pipe/OreAggregationAdder.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@
1515
*/
1616
package org.culturegraph.mf.stream.pipe;
1717

18-
import java.util.Deque;
19-
import java.util.LinkedList;
20-
import java.util.List;
21-
import java.util.Map.Entry;
22-
import java.util.Properties;
23-
import java.util.regex.Pattern;
24-
25-
import org.culturegraph.mf.framework.DefaultStreamPipe;
26-
import org.culturegraph.mf.framework.StreamReceiver;
27-
import org.culturegraph.mf.framework.annotations.Description;
28-
import org.culturegraph.mf.framework.annotations.In;
29-
import org.culturegraph.mf.framework.annotations.Out;
30-
import org.culturegraph.mf.types.ListMap;
31-
import org.culturegraph.mf.util.ResourceUtil;
18+
import java.util.Deque;
19+
import java.util.LinkedList;
20+
import java.util.List;
21+
import java.util.Map.Entry;
22+
import java.util.Properties;
23+
import java.util.regex.Pattern;
24+
25+
import org.culturegraph.mf.framework.DefaultStreamPipe;
26+
import org.culturegraph.mf.framework.StreamReceiver;
27+
import org.culturegraph.mf.framework.annotations.Description;
28+
import org.culturegraph.mf.framework.annotations.In;
29+
import org.culturegraph.mf.framework.annotations.Out;
30+
import org.culturegraph.mf.types.ListMap;
31+
import org.culturegraph.mf.util.ResourceUtil;
3232

3333

3434

@@ -60,7 +60,7 @@ public final class OreAggregationAdder extends DefaultStreamPipe<StreamReceiver>
6060
final String[] parts = SPLIT_PATTERN.split(entry.getValue().toString());
6161
final String name = entry.getKey().toString();
6262
for (String value : parts) {
63-
AGGREGATED_ENTITIES.put(name, value);
63+
AGGREGATED_ENTITIES.add(name, value);
6464
}
6565
}
6666
}
@@ -123,13 +123,13 @@ public void literal(final String name, final String value) {
123123
if (AGGREGATION_ID.equals(name)) {
124124
aggregationId = value;
125125
} else {
126-
aggregation.put(name, value);
126+
aggregation.add(name, value);
127127
}
128128
return;
129129
}
130130

131131
if (entityStack.size()==1 && RDF_ABOUT.equals(name) && AGGREGATED_ENTITIES.containsKey(entityStack.peek())) {
132-
aggregation.put(entityStack.peek(), value);
132+
aggregation.add(entityStack.peek(), value);
133133
}
134134
getReceiver().literal(name, value);
135135
}

src/main/java/org/culturegraph/mf/stream/sink/StringListMap.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ public Set<String> keySet() {
7777
return listMap.keySet();
7878
}
7979

80-
public void put(final String name, final String value) {
81-
listMap.put(name, value);
80+
public void add(final String name, final String value) {
81+
listMap.add(name, value);
8282
}
8383

8484
public void putAll(final String name, final Collection<String> addValues) {
@@ -177,7 +177,7 @@ public void endRecord() {
177177

178178
@Override
179179
public void literal(final String name, final String value) {
180-
listMap.put(name, value);
180+
listMap.add(name, value);
181181
}
182182

183183
@Override

src/main/java/org/culturegraph/mf/types/ListMap.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public final Set<K> keySet() {
8787
}
8888

8989

90-
public final void put(final K name, final V value) {
90+
public final void add(final K name, final V value) {
9191

9292
List<V> values = map.get(name);
9393
if (values == null) {
@@ -97,7 +97,8 @@ public final void put(final K name, final V value) {
9797

9898
values.add(value);
9999
}
100-
100+
101+
//@Override
101102
public final void putAll(final K name, final Collection<V> addValues) {
102103

103104
List<V> values = map.get(name);

src/test/java/org/culturegraph/mf/stream/type/ListMapTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ public void test() {
3838
final ListMap<String, String> listMap = new ListMap<String, String>();
3939

4040
Assert.assertNull(listMap.getFirst(NAME1));
41-
listMap.put(NAME1, VALUE1);
41+
listMap.add(NAME1, VALUE1);
4242
Assert.assertNotNull(listMap.getFirst(NAME1));
4343
Assert.assertEquals(VALUE1, listMap.getFirst(NAME1));
4444

45-
listMap.put(NAME1, VALUE2);
45+
listMap.add(NAME1, VALUE2);
4646
Assert.assertNotNull(listMap.getFirst(NAME1));
4747
Assert.assertEquals(VALUE1, listMap.getFirst(NAME1));
4848

@@ -53,7 +53,7 @@ public void test() {
5353
Assert.assertNotNull(listMap.get(NAME2));
5454
Assert.assertEquals(0, listMap.get(NAME2).size());
5555

56-
listMap.put(NAME2, VALUE2);
56+
listMap.add(NAME2, VALUE2);
5757
Assert.assertNotNull(listMap.getFirst(NAME2));
5858
listMap.clearKey(NAME2);
5959
Assert.assertNull(listMap.getFirst(NAME2));

0 commit comments

Comments
 (0)