Skip to content

Commit 5054b1b

Browse files
committed
Fix compiler warnings, editorconfig and checkstyle violations
Set up ignores for bin folders and harvester2 package
1 parent 49d97ef commit 5054b1b

File tree

7 files changed

+29
-23
lines changed

7 files changed

+29
-23
lines changed

build.gradle

+5-3
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ editorconfig {
4747
'**/*.bzip2',
4848
'**/*.gzip',
4949
'**/*.xz',
50-
'gradlew*'
50+
'gradlew*',
51+
'**/bin'
5152
]
5253
}
5354

@@ -95,6 +96,7 @@ subprojects {
9596
options {
9697
addBooleanOption 'Xwerror', true
9798
}
99+
exclude '**/harvester2/**'
98100
}
99101

100102
artifacts {
@@ -242,7 +244,7 @@ gradle.projectsEvaluated {
242244
}
243245
}
244246

245-
//'upload' vs. 'publish, see
247+
//'upload' vs. 'publish, see
246248
//https://medium.com/dot-debug/deploying-artifacts-to-maven-using-gradle-b669acc1b6f8'
247249
/*
248250
task publish {
@@ -264,7 +266,7 @@ gradle.projectsEvaluated {
264266
repositories {
265267
maven {
266268
name = 'localEmbedded'
267-
// run generated gradle task `./gradlew
269+
// run generated gradle task `./gradlew
268270
// publishMavenArtifactsPublicationToLocalEmbeddedRepository`
269271
// to publish all subprojects into the same local embedded repo:
270272
url = "file://${rootDir}/build/repo"

config/checkstyle/checkstyle.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<module name="SuppressWarningsFilter" />
77
<module name="SuppressionSingleFilter">
88
<property name="checks" value=".*"/>
9-
<property name="files" value="generated-src"/>
9+
<property name="files" value="generated-src|harvester2"/>
1010
</module>
1111
<module name="TreeWalker">
1212
<module name="AbstractClassName"/>

metafacture-biblio/src/main/java/org/metafacture/biblio/OaiPmhOpener.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33

44
package org.metafacture.biblio;
55

6-
import java.io.ByteArrayInputStream;
7-
import java.io.ByteArrayOutputStream;
8-
import java.io.IOException;
9-
import java.io.InputStreamReader;
10-
import java.io.Reader;
11-
12-
import javax.xml.parsers.ParserConfigurationException;
13-
import javax.xml.xpath.XPathException;
14-
156
import org.metafacture.framework.MetafactureException;
167
import org.metafacture.framework.ObjectReceiver;
178
import org.metafacture.framework.annotations.Description;
189
import org.metafacture.framework.annotations.In;
1910
import org.metafacture.framework.annotations.Out;
2011
import org.metafacture.framework.helpers.DefaultObjectPipe;
12+
2113
import org.oclc.oai.harvester2.app.RawWrite;
2214
import org.xml.sax.SAXException;
2315

16+
import java.io.ByteArrayInputStream;
17+
import java.io.ByteArrayOutputStream;
18+
import java.io.IOException;
19+
import java.io.InputStreamReader;
20+
import java.io.Reader;
21+
import javax.xml.parsers.ParserConfigurationException;
22+
import javax.xml.xpath.XPathException;
23+
2424
/**
2525
* Opens an OAI-PMH stream and passes a reader to the receiver.
2626
*
@@ -114,7 +114,7 @@ public void process(final String baseUrl) {
114114
catch (final NoSuchFieldException e) {
115115
e.printStackTrace();
116116
}
117-
catch (XPathException e) {
117+
catch (final XPathException e) {
118118
e.printStackTrace();
119119
}
120120
try {

metafacture-biblio/src/main/java/org/oclc/oai/harvester2/app/RawWrite.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ public static void main(String[] args) {
3131
try {
3232
System.out.println(new Date());
3333

34-
HashMap options = getOptions(args);
35-
List rootArgs = (List) options.get("rootArgs");
34+
HashMap<String, Object> options = getOptions(args);
35+
List<?> rootArgs = (List<?>) options.get("rootArgs");
3636
String baseURL = null;
3737
if (rootArgs.size() > 0) {
3838
baseURL = (String) rootArgs.get(0);
@@ -151,9 +151,9 @@ public static void run(String baseURL, String from, String until,
151151
out.write("</harvest>\n".getBytes("UTF-8"));
152152
}
153153

154-
private static HashMap getOptions(String[] args) {
155-
HashMap options = new HashMap();
156-
ArrayList rootArgs = new ArrayList();
154+
private static HashMap<String, Object> getOptions(String[] args) {
155+
HashMap<String, Object> options = new HashMap<>();
156+
ArrayList<String> rootArgs = new ArrayList<>();
157157
options.put("rootArgs", rootArgs);
158158

159159
for (int i = 0; i < args.length; ++i) {

metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/ListIdentifiers.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,11 @@
1212
package org.oclc.oai.harvester2.verb;
1313

1414
import java.io.IOException;
15+
import java.io.UnsupportedEncodingException;
1516
import java.net.MalformedURLException;
1617
import java.net.URLEncoder;
18+
import java.nio.charset.StandardCharsets;
19+
1720
import javax.xml.parsers.ParserConfigurationException;
1821
import javax.xml.xpath.XPathExpressionException;
1922
import org.xml.sax.SAXException;
@@ -106,12 +109,13 @@ private static String getRequestURL(String baseURL, String from, String until, S
106109
* @param baseURL
107110
* @param resumptionToken
108111
* @return
112+
* @throws UnsupportedEncodingException
109113
*/
110114
private static String getRequestURL(String baseURL,
111-
String resumptionToken) {
115+
String resumptionToken) throws UnsupportedEncodingException {
112116
StringBuilder requestURL = new StringBuilder(baseURL);
113117
requestURL.append("?verb=ListIdentifiers");
114-
requestURL.append("&resumptionToken=").append(URLEncoder.encode(resumptionToken));
118+
requestURL.append("&resumptionToken=").append(URLEncoder.encode(resumptionToken, StandardCharsets.UTF_8.name()));
115119
return requestURL.toString();
116120
}
117121
}

metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/ListMetadataFormats.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ListMetadataFormats() {
4141
* @throws javax.xml.xpath.XPathExpressionException
4242
* @throws IOException an I/O error occurred
4343
*/
44-
public ListMetadataFormats(String baseURL) throws IOException, ParserConfigurationException,
44+
public ListMetadataFormats(String baseURL) throws IOException, ParserConfigurationException,
4545
SAXException, XPathExpressionException {
4646
this(baseURL, null);
4747
}

metafacture-biblio/src/main/java/org/oclc/oai/harvester2/verb/OAINamespaceContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public String getPrefix(String namespaceURI) {
3636
}
3737

3838
@Override
39-
public Iterator getPrefixes(String namespaceURI) {
39+
public Iterator<?> getPrefixes(String namespaceURI) {
4040
return null;
4141
}
4242

0 commit comments

Comments
 (0)