Skip to content

Commit 859d478

Browse files
blackwinterblackwinter
committed
metafacture-linkeddata/ (main): Fix Checkstyle violations.
1 parent 1ff9662 commit 859d478

File tree

4 files changed

+57
-39
lines changed

4 files changed

+57
-39
lines changed

‎metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/BeaconReader.java

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.metafacture.linkeddata;
1716

18-
import java.io.BufferedReader;
19-
import java.io.IOException;
20-
import java.io.Reader;
21-
import java.util.HashMap;
22-
import java.util.Map;
23-
import java.util.regex.Matcher;
24-
import java.util.regex.Pattern;
17+
package org.metafacture.linkeddata;
2518

2619
import org.metafacture.framework.FluxCommand;
2720
import org.metafacture.framework.MetafactureException;
@@ -31,6 +24,14 @@
3124
import org.metafacture.framework.annotations.Out;
3225
import org.metafacture.framework.helpers.DefaultObjectPipe;
3326

27+
import java.io.BufferedReader;
28+
import java.io.IOException;
29+
import java.io.Reader;
30+
import java.util.HashMap;
31+
import java.util.Map;
32+
import java.util.regex.Matcher;
33+
import java.util.regex.Pattern;
34+
3435
/**
3536
* Reads BEACON format
3637
*
@@ -56,6 +57,9 @@ public final class BeaconReader extends DefaultObjectPipe<java.io.Reader, Stream
5657
private Pattern metaDataFilter = Pattern.compile(".*");
5758
private String relation = DEFAULT_RELATION;
5859

60+
public BeaconReader() {
61+
}
62+
5963
/**
6064
* @param bufferSize
6165
* in MB
@@ -72,7 +76,7 @@ public void setMetaDataFilter(final String metaDataFilter) {
7276
this.metaDataFilter = Pattern.compile(metaDataFilter);
7377
}
7478

75-
@Override
79+
@Override // checkstyle-disable-line CyclomaticComplexity|ExecutableStatementCount
7680
public void process(final Reader reader) {
7781
final BufferedReader bReader = new BufferedReader(reader, bufferSize);
7882
final Map<String, String> institution = new HashMap<String, String>();
@@ -92,16 +96,19 @@ public void process(final Reader reader) {
9296
final String value = line.substring(splitPoint + 1).trim();
9397
if (TARGET.equals(key)) {
9498
target = value;
95-
} else if (metaDataFilter.matcher(key).find()) {
99+
}
100+
else if (metaDataFilter.matcher(key).find()) {
96101
institution.put(key, value);
97102
}
98103
}
99-
} else {
104+
}
105+
else {
100106
final String[] parts = line.split("\\|");
101107
final String url;
102108
if (parts.length == COLUMNS_EXTENDED_BEACON) {
103109
url = parts[2];
104-
} else {
110+
}
111+
else {
105112
if (target == null || target.isEmpty()) {
106113
throw new MetafactureException("Error in BEACON file: target missing");
107114
}
@@ -111,7 +118,7 @@ public void process(final Reader reader) {
111118
receiver.startRecord(parts[0]);
112119
receiver.startEntity(relation);
113120
receiver.literal("url", url);
114-
for (Map.Entry<String, String> instEntry : institution.entrySet()) {
121+
for (final Map.Entry<String, String> instEntry : institution.entrySet()) {
115122
receiver.literal(instEntry.getKey(), instEntry.getValue());
116123
}
117124
receiver.endEntity();
@@ -122,7 +129,8 @@ public void process(final Reader reader) {
122129
}
123130
bReader.close();
124131

125-
} catch (IOException e) {
132+
}
133+
catch (final IOException e) {
126134
throw new MetafactureException("Error reading BEACON format", e);
127135
}
128136
}

‎metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/OreAggregationAdder.java

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,8 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package org.metafacture.linkeddata;
1716

18-
import java.io.IOException;
19-
import java.util.Deque;
20-
import java.util.LinkedList;
21-
import java.util.List;
22-
import java.util.Map.Entry;
23-
import java.util.Properties;
24-
import java.util.regex.Pattern;
17+
package org.metafacture.linkeddata;
2518

2619
import org.metafacture.commons.ResourceUtil;
2720
import org.metafacture.commons.types.ListMap;
@@ -33,7 +26,13 @@
3326
import org.metafacture.framework.annotations.Out;
3427
import org.metafacture.framework.helpers.DefaultStreamPipe;
3528

36-
29+
import java.io.IOException;
30+
import java.util.Deque;
31+
import java.util.LinkedList;
32+
import java.util.List;
33+
import java.util.Map.Entry;
34+
import java.util.Properties;
35+
import java.util.regex.Pattern;
3736

3837
/**
3938
* Adds ore:Aggregation to an Europeana Data Model stream. The aggregation id is
@@ -63,18 +62,22 @@ public final class OreAggregationAdder extends DefaultStreamPipe<StreamReceiver>
6362
final Properties properties;
6463
try {
6564
properties = ResourceUtil.loadProperties(ORE_AGGREGATION_PROPERTIES);
66-
} catch (IOException e) {
65+
}
66+
catch (final IOException e) {
6767
throw new MetafactureException("Failed to load properties", e);
6868
}
69-
for (Entry<Object, Object> entry : properties.entrySet()) {
69+
for (final Entry<Object, Object> entry : properties.entrySet()) {
7070
final String[] parts = SPLIT_PATTERN.split(entry.getValue().toString());
7171
final String name = entry.getKey().toString();
72-
for (String value : parts) {
72+
for (final String value : parts) {
7373
AGGREGATED_ENTITIES.add(name, value);
7474
}
7575
}
7676
}
7777

78+
public OreAggregationAdder() {
79+
}
80+
7881
@Override
7982
public void startRecord(final String identifier) {
8083
entityStack.clear();
@@ -94,19 +97,20 @@ private void writeAggregation() {
9497
final StreamReceiver receiver = getReceiver();
9598
receiver.startEntity(ORE_AGGREGATION);
9699
receiver.literal(RDF_ABOUT, aggregationId);
97-
for (Entry<String, List<String>> entry : aggregation.entrySet()) {
100+
for (final Entry<String, List<String>> entry : aggregation.entrySet()) {
98101
final String key = entry.getKey();
99102
if (AGGREGATED_ENTITIES.containsKey(key)) {
100103

101-
for (String entity : AGGREGATED_ENTITIES.get(key)) {
102-
for (String value : entry.getValue()) {
104+
for (final String entity : AGGREGATED_ENTITIES.get(key)) {
105+
for (final String value : entry.getValue()) {
103106
receiver.startEntity(entity);
104107
receiver.literal(RDF_REFERENCE, value);
105108
receiver.endEntity();
106109
}
107110
}
108-
} else {
109-
for (String value : entry.getValue()) {
111+
}
112+
else {
113+
for (final String value : entry.getValue()) {
110114
receiver.literal(key, value);
111115
}
112116
}
@@ -132,13 +136,14 @@ public void literal(final String name, final String value) {
132136
if (entityStack.isEmpty()) {
133137
if (AGGREGATION_ID.equals(name)) {
134138
aggregationId = value;
135-
} else {
139+
}
140+
else {
136141
aggregation.add(name, value);
137142
}
138143
return;
139144
}
140145

141-
if (entityStack.size()==1 && RDF_ABOUT.equals(name) && AGGREGATED_ENTITIES.containsKey(entityStack.peek())) {
146+
if (entityStack.size() == 1 && RDF_ABOUT.equals(name) && AGGREGATED_ENTITIES.containsKey(entityStack.peek())) {
142147
aggregation.add(entityStack.peek(), value);
143148
}
144149
getReceiver().literal(name, value);

‎metafacture-linkeddata/src/main/java/org/metafacture/linkeddata/RdfMacroPipe.java

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.metafacture.linkeddata;
1718

1819
import org.metafacture.framework.FluxCommand;
@@ -34,31 +35,32 @@
3435
@FluxCommand("rdf-macros")
3536
public final class RdfMacroPipe extends DefaultStreamPipe<StreamReceiver> {
3637

37-
3838
public static final char REFERENCE_MARKER = '*';
3939
public static final char LANGUAGE_MARKER = '$';
4040
public static final String RDF_REFERENCE = "~rdf:resource";
4141
public static final String RDF_ABOUT = "~rdf:about";
4242
public static final String XML_LANG = "~xml:lang";
4343
private String autoAddedSubject = "";
4444

45+
public RdfMacroPipe() {
46+
}
47+
4548
public void setAutoAddedSubject(final String autoAddedSubject) {
4649
this.autoAddedSubject = autoAddedSubject;
4750
}
4851

49-
5052
@Override
5153
public void startRecord(final String identifier) {
5254
getReceiver().startRecord(identifier);
53-
if(!autoAddedSubject.isEmpty()){
55+
if (!autoAddedSubject.isEmpty()) {
5456
getReceiver().startEntity(autoAddedSubject);
5557
getReceiver().literal(RDF_ABOUT, identifier);
5658
}
5759
}
5860

5961
@Override
6062
public void endRecord() {
61-
if(!autoAddedSubject.isEmpty()){
63+
if (!autoAddedSubject.isEmpty()) {
6264
getReceiver().endEntity();
6365
}
6466
getReceiver().endRecord();
@@ -82,12 +84,14 @@ public void literal(final String name, final String value) {
8284
getReceiver().startEntity(name.substring(1));
8385
getReceiver().literal(RDF_REFERENCE, value);
8486
getReceiver().endEntity();
85-
} else if (index > 0) {
87+
}
88+
else if (index > 0) {
8689
getReceiver().startEntity(name.substring(0, index));
8790
getReceiver().literal(XML_LANG, name.substring(index + 1));
8891
getReceiver().literal("", value);
8992
getReceiver().endEntity();
90-
} else {
93+
}
94+
else {
9195
getReceiver().literal(name, value);
9296
}
9397
}

‎metafacture-linkeddata/src/test/java/org/metafacture/linkeddata/OreAggregationAdderTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
1617
package org.metafacture.linkeddata;
1718

1819
import static org.mockito.Mockito.inOrder;

0 commit comments

Comments
 (0)