Skip to content

Commit 4f1fc65

Browse files
committed
Fulfill checkstyle complaints
Resolves #682 (comment).
1 parent a369df5 commit 4f1fc65

File tree

2 files changed

+30
-37
lines changed

2 files changed

+30
-37
lines changed

metafacture-io/src/main/java/org/metafacture/io/SruOpener.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
*
5353
* @author Pascal Christoph (dr0i)
5454
*/
55-
@Description(
55+
@Description(// checkstyle-disable-line ClassDataAbstractionCoupling|ClassFanOutComplexity
5656
"Opens a SRU stream and passes a reader to the receiver. The input is the base URL of the SRU service " +
5757
"to be retrieved from. Mandatory argument is: QUERY.\n" +
5858
"The output is an XML document holding the user defined \"maximumRecords\" as documents. If there are" +
@@ -61,7 +61,6 @@
6161
@In(String.class)
6262
@Out(java.io.Reader.class)
6363
@FluxCommand("open-sru")
64-
@SuppressWarnings("checkstyle:ClassFanOutComplexity")
6564
public final class SruOpener extends DefaultObjectPipe<String, ObjectReceiver<Reader>> {
6665

6766
private static final String OPERATION = "searchRetrieve";

metafacture-io/src/test/java/org/metafacture/io/SruOpenerTest.java

Lines changed: 29 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,37 +16,34 @@
1616

1717
package org.metafacture.io;
1818

19+
import org.metafacture.framework.ObjectReceiver;
20+
import org.metafacture.framework.helpers.DefaultObjectPipe;
21+
1922
import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
2023
import com.github.tomakehurst.wiremock.junit.WireMockRule;
2124
import org.junit.Before;
2225
import org.junit.Rule;
2326
import org.junit.Test;
24-
import org.metafacture.framework.ObjectReceiver;
25-
import org.metafacture.framework.helpers.DefaultObjectPipe;
2627
import org.mockito.Mock;
2728
import org.mockito.junit.MockitoJUnit;
2829
import org.mockito.junit.MockitoRule;
2930

3031
import java.io.IOException;
3132
import java.io.Reader;
3233

33-
3434
public final class SruOpenerTest {
3535

36-
private static StringBuilder resultCollector = new StringBuilder();
36+
private static final StringBuilder RESULT_COLLECTOR = new StringBuilder();
3737
private static final String RESPONSE_BODY = "response bödy"; // UTF-8
3838
private static final String TEST_URL = "/test/path";
39-
private static SruOpener sruOpener = new SruOpener();
40-
39+
private static final SruOpener SRU_OPENER = new SruOpener();
4140

4241
@Rule
4342
public MockitoRule mockitoRule = MockitoJUnit.rule();
4443

4544
@Rule
46-
public WireMockRule wireMockRule = new WireMockRule(WireMockConfiguration.wireMockConfig().
47-
jettyAcceptors(Runtime.getRuntime()
48-
.availableProcessors())
49-
.dynamicPort());
45+
public WireMockRule wireMockRule = new WireMockRule(WireMockConfiguration.wireMockConfig()
46+
.jettyAcceptors(Runtime.getRuntime().availableProcessors()).dynamicPort());
5047

5148
@Mock
5249
private ObjectReceiver<Reader> receiver;
@@ -56,36 +53,34 @@ public SruOpenerTest() {
5653

5754
@Before
5855
public void setUp() {
59-
sruOpener = new SruOpener();
6056
final char[] buffer = new char[1024 * 1024 * 16];
61-
sruOpener.setReceiver(new DefaultObjectPipe<Reader, ObjectReceiver<String>>() {
57+
SRU_OPENER.setReceiver(new DefaultObjectPipe<Reader, ObjectReceiver<String>>() {
6258
@Override
6359
public void process(final Reader reader) {
6460
int size;
6561
try {
6662
while ((size = reader.read(buffer)) != -1) {
67-
resultCollector.append(buffer, 0, size);
63+
RESULT_COLLECTOR.append(buffer, 0, size);
6864
}
69-
} catch (IOException e) {
65+
}
66+
catch (final IOException e) {
7067
throw new RuntimeException(e);
7168
}
7269
}
7370
});
7471
}
7572

76-
7773
@Test
78-
public void test_(){
79-
74+
public void test1() {
8075
// sruOpener.setQuery("dnb.isil%3DDE-Sol1");
81-
sruOpener.setQuery("WVN=24A05");
82-
sruOpener.setRecordSchema("MARC21plus-xml");
83-
sruOpener.setVersion("1.1");
84-
sruOpener.setStartRecord(1890);
85-
sruOpener.setMaximumRecords(1);
86-
sruOpener.setTotalRecords(3);
87-
sruOpener.process("https://services.dnb.de/sru/dnb");
88-
System.out.println(resultCollector.toString());
76+
SRU_OPENER.setQuery("WVN=24A05");
77+
SRU_OPENER.setRecordSchema("MARC21plus-xml");
78+
SRU_OPENER.setVersion("1.1");
79+
SRU_OPENER.setStartRecord(1890);
80+
SRU_OPENER.setMaximumRecords(1);
81+
SRU_OPENER.setTotalRecords(3);
82+
SRU_OPENER.process("https://services.dnb.de/sru/dnb");
83+
System.out.println(RESULT_COLLECTOR.toString());
8984
}
9085

9186
/* @Test
@@ -101,19 +96,18 @@ public void shouldPerformGetRequestWithInputAsUrlByDefault() throws IOException
10196

10297
@Test
10398
public void test() {
104-
SruOpener sruOpener = new SruOpener();
105-
RecordReader recordReader = new RecordReader();
99+
final RecordReader recordReader = new RecordReader();
106100
recordReader.setReceiver(new ObjectStdoutWriter<String>());
107-
sruOpener.setReceiver(recordReader);// {
108-
sruOpener.setQuery("dnb.isil=DE-Sol1");
101+
SRU_OPENER.setReceiver(recordReader);
102+
SRU_OPENER.setQuery("dnb.isil=DE-Sol1");
109103
// sruOpener.setQuery("WVN%3D24A05");
110-
sruOpener.setRecordSchema("MARC21plus-xml");
111-
sruOpener.setVersion("1.1");
112-
sruOpener.setStartRecord(3029);
113-
sruOpener.setMaximumRecords(1);
114-
sruOpener.setTotalRecords(1);
104+
SRU_OPENER.setRecordSchema("MARC21plus-xml");
105+
SRU_OPENER.setVersion("1.1");
106+
SRU_OPENER.setStartRecord(3029);
107+
SRU_OPENER.setMaximumRecords(1);
108+
SRU_OPENER.setTotalRecords(1);
115109
// sruOpener.process("https://services.dnb.de/sru/dnb");
116-
sruOpener.process("https://services.dnb.de/sru/zdb");
110+
SRU_OPENER.process("https://services.dnb.de/sru/zdb");
117111
// sruOpener.process("https://amsquery.stadt-zuerich.ch/sru/");
118112
// System.out.println(resultCollector.toString());
119113
}

0 commit comments

Comments
 (0)