Skip to content

Commit ee227be

Browse files
committed
Fix compiler warnings in harvester2 package
1 parent 49d97ef commit ee227be

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

Diff for: 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) {

Diff for: 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
}

Diff for: 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)