diff --git a/commons/src/main/java/org/apache/commons/httpclient/Cookie.java b/commons/src/main/java/org/apache/commons/httpclient/Cookie.java index 5f0650984..1db473a85 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/Cookie.java +++ b/commons/src/main/java/org/apache/commons/httpclient/Cookie.java @@ -61,8 +61,8 @@ * * @version $Revision$ $Date$ */ -@SuppressWarnings({"serial","unchecked"}) // <- HERITRIX CHANGE -public class Cookie extends NameValuePair implements Serializable, Comparator { +@SuppressWarnings({"serial"}) // <- HERITRIX CHANGE +public class Cookie extends NameValuePair implements Serializable, Comparator { // ----------------------------------------------------------- Constructors @@ -415,6 +415,7 @@ public int hashCode() { * @param obj The object to compare against. * @return true if the two objects are equal. */ + @Override public boolean equals(Object obj) { if (obj == null) return false; if (this == obj) return true; @@ -454,7 +455,8 @@ public String toExternalForm() { * @param o2 The second object to be compared * @return See {@link java.util.Comparator#compare(Object,Object)} */ - public int compare(Object o1, Object o2) { + @Override + public int compare(Cookie o1, Cookie o2) { LOG.trace("enter Cookie.compare(Object, Object)"); if (!(o1 instanceof Cookie)) { diff --git a/commons/src/main/java/org/apache/commons/httpclient/HttpConnection.java b/commons/src/main/java/org/apache/commons/httpclient/HttpConnection.java index c9e86a615..d9c2cf134 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/HttpConnection.java +++ b/commons/src/main/java/org/apache/commons/httpclient/HttpConnection.java @@ -91,7 +91,6 @@ * * @version $Revision$ $Date$ */ -@SuppressWarnings("unchecked") // <- HERITRIX CHANGE public class HttpConnection { // ----------------------------------------------------------- Constructors @@ -1162,7 +1161,7 @@ public void shutdownOutput() { // Socket.shutdownOutput is a JDK 1.3 // method. We'll use reflection in case // we're running in an older VM - Class[] paramsClasses = new Class[0]; + Class[] paramsClasses = new Class[0]; Method shutdownOutput = socket.getClass().getMethod("shutdownOutput", paramsClasses); Object[] params = new Object[0]; diff --git a/commons/src/main/java/org/apache/commons/httpclient/HttpMethodBase.java b/commons/src/main/java/org/apache/commons/httpclient/HttpMethodBase.java index fe8be4b01..cda1b9d20 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/HttpMethodBase.java +++ b/commons/src/main/java/org/apache/commons/httpclient/HttpMethodBase.java @@ -94,7 +94,7 @@ * * @version $Revision$ $Date$ */ -@SuppressWarnings({"deprecation","unchecked"}) // <- // IA/HERITRIX change +@SuppressWarnings({"deprecation"}) // <- // IA/HERITRIX change public abstract class HttpMethodBase implements HttpMethod { // -------------------------------------------------------------- Constants @@ -1145,8 +1145,9 @@ private CookieSpec getCookieSpec(final HttpState state) { } else { this.cookiespec = CookiePolicy.getSpecByPolicy(i); } - this.cookiespec.setValidDateFormats( - (Collection)this.params.getParameter(HttpMethodParams.DATE_PATTERNS)); + @SuppressWarnings("unchecked") + Collection val = (Collection)this.params.getParameter(HttpMethodParams.DATE_PATTERNS); + this.cookiespec.setValidDateFormats(val); } return this.cookiespec; } diff --git a/commons/src/main/java/org/apache/commons/httpclient/HttpParser.java b/commons/src/main/java/org/apache/commons/httpclient/HttpParser.java index 7ae07c974..a67636552 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/HttpParser.java +++ b/commons/src/main/java/org/apache/commons/httpclient/HttpParser.java @@ -47,7 +47,6 @@ * * @since 2.0beta1 */ -@SuppressWarnings("unchecked") // <- IA/HERITRIX CHANGE public class HttpParser { /** Log object for this class. */ @@ -159,7 +158,7 @@ public static String readLine(InputStream inputStream) throws IOException { public static Header[] parseHeaders(InputStream is, String charset) throws IOException, HttpException { LOG.trace("enter HeaderParser.parseHeaders(InputStream, String)"); - ArrayList headers = new ArrayList(); + ArrayList
headers = new ArrayList
(); String name = null; StringBuffer value = null; for (; ;) { diff --git a/commons/src/main/java/org/apache/commons/httpclient/HttpState.java b/commons/src/main/java/org/apache/commons/httpclient/HttpState.java index 031ac5f14..5b95cb26f 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/HttpState.java +++ b/commons/src/main/java/org/apache/commons/httpclient/HttpState.java @@ -30,23 +30,21 @@ package org.apache.commons.httpclient; import java.util.ArrayList; -import java.util.Collection; // <- IA/HERITRIX CHANGE +import java.util.Collection; import java.util.Date; import java.util.HashMap; -import java.util.Map; -import java.util.List; import java.util.Iterator; -import java.util.SortedMap; // <- IA/HERITRIX CHANGE -import java.util.TreeMap; // <- IA/HERITRIX CHANGE +import java.util.Map; +import java.util.SortedMap; import java.util.concurrent.ConcurrentSkipListMap; -import org.apache.commons.httpclient.cookie.CookieSpec; +import org.apache.commons.httpclient.auth.AuthScope; import org.apache.commons.httpclient.cookie.CookiePolicy; -import org.apache.commons.httpclient.auth.AuthScope; +import org.apache.commons.httpclient.cookie.CookieSpec; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import com.sleepycat.collections.StoredIterator; // <- IA/HERITRIX CHANGE +import com.sleepycat.collections.StoredIterator; /** *

@@ -67,7 +65,6 @@ * @version $Revision$ $Date$ * */ -@SuppressWarnings({"unchecked","unused"}) // <- IA/HERITRIX CHANGE public class HttpState { // ----------------------------------------------------- Instance Variables @@ -76,13 +73,13 @@ public class HttpState { * Map of {@link Credentials credentials} by realm that this * HTTP state contains. */ - private HashMap credMap = new HashMap(); + private HashMap credMap = new HashMap(); /** * Map of {@link Credentials proxy credentials} by realm that this * HTTP state contains */ - private HashMap proxyCred = new HashMap(); + private HashMap proxyCred = new HashMap(); // BEGIN IA/HERITRIX CHANGES // /** @@ -92,7 +89,7 @@ public class HttpState { /** * SortedMap of {@link Cookie cookies} that this HTTP state contains. */ - private SortedMap cookiesMap = new ConcurrentSkipListMap(); + private SortedMap cookiesMap = new ConcurrentSkipListMap(); // END IA/HERITRIX CHANGES private boolean preemptive = false; @@ -200,8 +197,8 @@ public synchronized Cookie[] getCookies() { // BEGIN IA/HERITRIX CHANGES // PRIOR IMPL & COMPARISON HARNESS LEFT COMMENTED OUT FOR TEMPORARY REFERENCE // Cookie[] arrayListAnswer = (Cookie[]) (cookiesArrayList.toArray(new Cookie[cookiesArrayList.size()])); - ArrayList arrayableCookies = new ArrayList(); - Iterator iter = cookiesMap.values().iterator(); + ArrayList arrayableCookies = new ArrayList(); + Iterator iter = cookiesMap.values().iterator(); while(iter.hasNext()) { arrayableCookies.add(iter.next()); } @@ -226,7 +223,7 @@ public synchronized Cookie[] getCookies() { * * @return sorter map of {@link Cookie cookies} */ - public SortedMap getCookiesMap() { + public SortedMap getCookiesMap() { return cookiesMap; } @@ -236,7 +233,7 @@ public SortedMap getCookiesMap() { * * @param map alternate sorted map to use to store cookies */ - public void setCookiesMap(SortedMap map) { + public void setCookiesMap(SortedMap map) { this.cookiesMap = map; } // END IA/HERITRIX ADDITIONS @@ -321,9 +318,9 @@ public synchronized boolean purgeExpiredCookies(Date date) { // } // } boolean removed = false; - Iterator it = cookiesMap.values().iterator(); + Iterator it = cookiesMap.values().iterator(); while (it.hasNext()) { - if (((Cookie) (it.next())).isExpired(date)) { + if (it.next().isExpired(date)) { it.remove(); removed = true; } @@ -457,15 +454,15 @@ public synchronized void setCredentials(final AuthScope authscope, final Credent * @return the credentials * */ - private static Credentials matchCredentials(final HashMap map, final AuthScope authscope) { + private static Credentials matchCredentials(final HashMap map, final AuthScope authscope) { // see if we get a direct hit - Credentials creds = (Credentials)map.get(authscope); + Credentials creds = map.get(authscope); if (creds == null) { // Nope. // Do a full scan int bestMatchFactor = -1; AuthScope bestMatch = null; - Iterator items = map.keySet().iterator(); + Iterator items = map.keySet().iterator(); while (items.hasNext()) { AuthScope current = (AuthScope)items.next(); int factor = authscope.match(current); @@ -649,12 +646,12 @@ public synchronized String toString() { * @param credMap The credentials. * @return The string representation. */ - private static String getCredentialsStringRepresentation(final Map credMap) { + private static String getCredentialsStringRepresentation(final Map credMap) { StringBuffer sbResult = new StringBuffer(); - Iterator iter = credMap.keySet().iterator(); + Iterator iter = credMap.keySet().iterator(); while (iter.hasNext()) { Object key = iter.next(); - Credentials cred = (Credentials) credMap.get(key); + Credentials cred = credMap.get(key); if (sbResult.length() > 0) { sbResult.append(", "); } @@ -670,11 +667,11 @@ private static String getCredentialsStringRepresentation(final Map credMap) { * @param cookies The cookies * @return The string representation. */ - private static String getCookiesStringRepresentation(final Collection cookies) { // <- IA/HERITRIX CHANGE + private static String getCookiesStringRepresentation(final Collection cookies) { // <- IA/HERITRIX CHANGE StringBuffer sbResult = new StringBuffer(); - Iterator iter = cookies.iterator(); + Iterator iter = cookies.iterator(); while (iter.hasNext()) { - Cookie ck = (Cookie) iter.next(); + Cookie ck = iter.next(); if (sbResult.length() > 0) { sbResult.append("#"); } diff --git a/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpec.java b/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpec.java index 5b14bff4e..46be9ff8c 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpec.java +++ b/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpec.java @@ -51,7 +51,6 @@ * * @since 2.0 */ -@SuppressWarnings("unchecked") // <- IA/HERITRIX CHANGE public interface CookieSpec { /** Path delimiter */ @@ -140,7 +139,7 @@ void validate(String host, int port, String path, boolean secure, * * @param datepatterns collection of date patterns */ - void setValidDateFormats(Collection datepatterns); + void setValidDateFormats(Collection datepatterns); /** * Returns the {@link Collection} of date patterns used for parsing. The String patterns are compatible @@ -148,7 +147,7 @@ void validate(String host, int port, String path, boolean secure, * * @return collection of date patterns */ - Collection getValidDateFormats(); + Collection getValidDateFormats(); /** * Determines if a Cookie matches a location. @@ -195,7 +194,7 @@ Cookie[] match(String host, int port, String path, boolean secure, * * @param host the host to which the request is being submitted * @param port the port to which the request is being submitted - * (currenlty ignored) + * (currently ignored) * @param path the path to which the request is being submitted * @param secure true if the request is using a secure protocol * @param cookies SortedMap of Cookies to be matched @@ -203,7 +202,7 @@ Cookie[] match(String host, int port, String path, boolean secure, * @return true if the cookie should be submitted with a request * with given attributes, false otherwise. */ - Cookie[] match(String domain, int port, String path, boolean secure, SortedMap cookiesMap); + Cookie[] match(String domain, int port, String path, boolean secure, SortedMap cookiesMap); // END IA/HERITRIX CHANGES /** diff --git a/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpecBase.java b/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpecBase.java index 406e8ed34..170ab06f0 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpecBase.java +++ b/commons/src/main/java/org/apache/commons/httpclient/cookie/CookieSpecBase.java @@ -65,14 +65,13 @@ * * @since 2.0 */ -@SuppressWarnings("unchecked") // <- IA/HERITRIX CHANGE public class CookieSpecBase implements CookieSpec { /** Log object */ protected static final Log LOG = LogFactory.getLog(CookieSpec.class); /** Valid date patterns */ - private Collection datepatterns = null; + private Collection datepatterns = null; /** Default constructor */ public CookieSpecBase() { @@ -346,11 +345,13 @@ public void parseAttribute( } - public Collection getValidDateFormats() { + @Override + public Collection getValidDateFormats() { return this.datepatterns; } - public void setValidDateFormats(final Collection datepatterns) { + @Override + public void setValidDateFormats(final Collection datepatterns) { this.datepatterns = datepatterns; } @@ -580,7 +581,7 @@ public Cookie[] match(String host, int port, String path, if (cookies == null) { return null; } - List matching = new LinkedList(); + List matching = new LinkedList(); for (int i = 0; i < cookies.length; i++) { if (match(host, port, path, secure, cookies[i])) { addInPathOrder(matching, cookies[i]); @@ -606,9 +607,9 @@ public Cookie[] match(String host, int port, String path, * @param cookies SortedMap of Cookies to be matched * @return an array of Cookies matching the criterium */ - + @Override public Cookie[] match(String host, int port, String path, - boolean secure, final SortedMap cookies) { + boolean secure, final SortedMap cookies) { LOG.trace("enter CookieSpecBase.match(" + "String, int, String, boolean, SortedMap)"); @@ -616,7 +617,7 @@ public Cookie[] match(String host, int port, String path, if (cookies == null) { return null; } - List matching = new LinkedList(); + List matching = new LinkedList(); InternetDomainName domain; try { domain = InternetDomainName.fromLenient(host); @@ -626,7 +627,7 @@ public Cookie[] match(String host, int port, String path, String candidate = (domain!=null) ? domain.name() : host; while(candidate!=null) { - Iterator iter = cookies.subMap(candidate, + Iterator iter = cookies.subMap(candidate, candidate + Cookie.DOMAIN_OVERBOUNDS).values().iterator(); while (iter.hasNext()) { Cookie cookie = (Cookie) (iter.next()); @@ -656,7 +657,7 @@ public Cookie[] match(String host, int port, String path, * @param list - the list to add the cookie to * @param addCookie - the Cookie to add to list */ - private static void addInPathOrder(List list, Cookie addCookie) { + private static void addInPathOrder(List list, Cookie addCookie) { int i = 0; for (i = 0; i < list.size(); i++) { diff --git a/commons/src/main/java/org/apache/commons/httpclient/cookie/IgnoreCookiesSpec.java b/commons/src/main/java/org/apache/commons/httpclient/cookie/IgnoreCookiesSpec.java index 82e1a105b..8da6f6f92 100644 --- a/commons/src/main/java/org/apache/commons/httpclient/cookie/IgnoreCookiesSpec.java +++ b/commons/src/main/java/org/apache/commons/httpclient/cookie/IgnoreCookiesSpec.java @@ -42,7 +42,6 @@ * * @since 3.0 */ -@SuppressWarnings("unchecked") // <- IA/HERITRIX CHANGE public class IgnoreCookiesSpec implements CookieSpec { /** @@ -63,14 +62,16 @@ public Cookie[] parse(String host, int port, String path, boolean secure, String /** * @return null */ - public Collection getValidDateFormats() { + @Override + public Collection getValidDateFormats() { return null; } /** * Does nothing. */ - public void setValidDateFormats(Collection datepatterns) { + @Override + public void setValidDateFormats(Collection datepatterns) { } /** @@ -152,8 +153,9 @@ public boolean pathMatch(final String path, final String topmostPath) { } // BEGIN IA/HERITRIX ADDITION + @Override public Cookie[] match(String domain, int port, String path, boolean secure, - SortedMap cookiesMap) { + SortedMap cookiesMap) { return new Cookie[0]; } // END IA/HERITRIX CHANGE diff --git a/commons/src/main/java/org/archive/bdb/AutoKryo.java b/commons/src/main/java/org/archive/bdb/AutoKryo.java index 1306beec8..f12879601 100644 --- a/commons/src/main/java/org/archive/bdb/AutoKryo.java +++ b/commons/src/main/java/org/archive/bdb/AutoKryo.java @@ -26,15 +26,15 @@ */ @SuppressWarnings("unchecked") public class AutoKryo extends Kryo { - protected ArrayList registeredClasses = new ArrayList(); + protected ArrayList> registeredClasses = new ArrayList>(); @Override - protected void handleUnregisteredClass(Class type) { + protected void handleUnregisteredClass(@SuppressWarnings("rawtypes") Class type) { System.err.println("UNREGISTERED FOR KRYO "+type+" in "+registeredClasses.get(0)); super.handleUnregisteredClass(type); } - public void autoregister(Class type) { + public void autoregister(Class type) { if (registeredClasses.contains(type)) { return; } @@ -43,7 +43,7 @@ public void autoregister(Class type) { invokeStatic( "autoregisterTo", type, - new Class[]{ ((Class)AutoKryo.class), }, + new Class[]{ ((Class)AutoKryo.class), }, new Object[] { this, }); } catch (Exception e) { register(type); @@ -88,7 +88,7 @@ public T newInstance(Class type) { throw ex; } - protected Object invokeStatic(String method, Class clazz, Class[] types, Object[] args) throws Exception { + protected Object invokeStatic(String method, Class clazz, Class[] types, Object[] args) throws Exception { return clazz.getMethod(method, types).invoke(null, args); } } diff --git a/commons/src/main/java/org/archive/bdb/KryoBinding.java b/commons/src/main/java/org/archive/bdb/KryoBinding.java index 70002973a..51e547a7d 100644 --- a/commons/src/main/java/org/archive/bdb/KryoBinding.java +++ b/commons/src/main/java/org/archive/bdb/KryoBinding.java @@ -51,8 +51,7 @@ protected WeakReference initialValue() { * @param baseClass is the base class for serialized objects stored using * this binding */ - @SuppressWarnings("unchecked") - public KryoBinding(Class baseClass) { + public KryoBinding(Class baseClass) { this.baseClass = baseClass; kryo.autoregister(baseClass); // TODO: reevaluate if explicit registration should be required diff --git a/commons/src/main/java/org/archive/io/Arc2Warc.java b/commons/src/main/java/org/archive/io/Arc2Warc.java index 5cd99c959..eedd848f3 100644 --- a/commons/src/main/java/org/archive/io/Arc2Warc.java +++ b/commons/src/main/java/org/archive/io/Arc2Warc.java @@ -199,7 +199,7 @@ public static void main(String [] args) "Force overwrite of target file.")); PosixParser parser = new PosixParser(); CommandLine cmdline = parser.parse(options, args, false); - List cmdlineArgs = cmdline.getArgList(); + List cmdlineArgs = cmdline.getArgList(); Option [] cmdlineOptions = cmdline.getOptions(); HelpFormatter formatter = new HelpFormatter(); @@ -230,7 +230,7 @@ public static void main(String [] args) if (cmdlineArgs.size() != 2) { usage(formatter, options, 0); } - (new Arc2Warc()).transform(new File(cmdlineArgs.get(0).toString()), - new File(cmdlineArgs.get(1).toString()), force); + (new Arc2Warc()).transform(new File(cmdlineArgs.get(0)), + new File(cmdlineArgs.get(1)), force); } } diff --git a/commons/src/main/java/org/archive/io/Warc2Arc.java b/commons/src/main/java/org/archive/io/Warc2Arc.java index eb611ceaa..3cd1142f7 100644 --- a/commons/src/main/java/org/archive/io/Warc2Arc.java +++ b/commons/src/main/java/org/archive/io/Warc2Arc.java @@ -173,7 +173,6 @@ protected boolean isARCType(final String mimetype) { * @throws IOException * @throws java.text.ParseException */ - @SuppressWarnings("unchecked") public static void main(String [] args) throws ParseException, IOException, java.text.ParseException { Options options = new Options(); @@ -187,7 +186,8 @@ public static void main(String [] args) "Suffix to use on created ARC files, else uses default.")); PosixParser parser = new PosixParser(); CommandLine cmdline = parser.parse(options, args, false); - List cmdlineArgs = cmdline.getArgList(); + @SuppressWarnings("unchecked") + List cmdlineArgs = cmdline.getArgList(); Option [] cmdlineOptions = cmdline.getOptions(); HelpFormatter formatter = new HelpFormatter(); diff --git a/commons/src/main/java/org/archive/io/arc/ARCReader.java b/commons/src/main/java/org/archive/io/arc/ARCReader.java index fcb6c15ba..7f85cc2a8 100644 --- a/commons/src/main/java/org/archive/io/arc/ARCReader.java +++ b/commons/src/main/java/org/archive/io/arc/ARCReader.java @@ -453,7 +453,7 @@ public static void main(String [] args) options.addOption(new Option("p","parse", false, "Parse headers.")); PosixParser parser = new PosixParser(); CommandLine cmdline = parser.parse(options, args, false); - List cmdlineArgs = cmdline.getArgList(); + List cmdlineArgs = cmdline.getArgList(); Option [] cmdlineOptions = cmdline.getOptions(); HelpFormatter formatter = new HelpFormatter(); @@ -529,8 +529,7 @@ public static void main(String [] args) arc.setParseHttpHeaders(parse); outputRecord(arc, format); } else { - for (Iterator i = cmdlineArgs.iterator(); i.hasNext();) { - String urlOrPath = (String)i.next(); + for (String urlOrPath : cmdlineArgs) { try { ARCReader r = ARCReaderFactory.get(urlOrPath); r.setStrict(strict); diff --git a/commons/src/main/java/org/archive/io/warc/WARCReader.java b/commons/src/main/java/org/archive/io/warc/WARCReader.java index 3794a23d8..98a7e0248 100644 --- a/commons/src/main/java/org/archive/io/warc/WARCReader.java +++ b/commons/src/main/java/org/archive/io/warc/WARCReader.java @@ -192,13 +192,13 @@ public static void createCDXIndexFile(String urlOrPath) * @throws IOException * @throws java.text.ParseException */ - @SuppressWarnings("unchecked") public static void main(String [] args) throws ParseException, IOException, java.text.ParseException { Options options = getOptions(); PosixParser parser = new PosixParser(); CommandLine cmdline = parser.parse(options, args, false); - List cmdlineArgs = cmdline.getArgList(); + @SuppressWarnings("unchecked") + List cmdlineArgs = cmdline.getArgList(); Option [] cmdlineOptions = cmdline.getOptions(); HelpFormatter formatter = new HelpFormatter(); @@ -264,7 +264,7 @@ public static void main(String [] args) r.setStrict(strict); outputRecord(r, format); } else { - for (Iterator i = cmdlineArgs.iterator(); i.hasNext();) { + for (Iterator i = cmdlineArgs.iterator(); i.hasNext();) { String urlOrPath = (String)i.next(); try { WARCReader r = WARCReaderFactory.get(urlOrPath); diff --git a/commons/src/main/java/org/archive/spring/BeanFieldsPatternValidator.java b/commons/src/main/java/org/archive/spring/BeanFieldsPatternValidator.java index 7e5301410..11c5faf7f 100644 --- a/commons/src/main/java/org/archive/spring/BeanFieldsPatternValidator.java +++ b/commons/src/main/java/org/archive/spring/BeanFieldsPatternValidator.java @@ -63,8 +63,7 @@ public BeanFieldsPatternValidator(Class clazz, String ... fieldsPatterns) { } } - @SuppressWarnings("unchecked") - public boolean supports(Class cls) { + public boolean supports(Class cls) { return this.clazz.isAssignableFrom(cls); } diff --git a/commons/src/main/java/org/archive/spring/ConfigFileEditor.java b/commons/src/main/java/org/archive/spring/ConfigFileEditor.java index 7bb897bab..c55daa792 100644 --- a/commons/src/main/java/org/archive/spring/ConfigFileEditor.java +++ b/commons/src/main/java/org/archive/spring/ConfigFileEditor.java @@ -23,8 +23,9 @@ * PropertyEditor allowing Strings to become ConfigFile instances. * */ -public class ConfigFileEditor extends ConfigPathEditor { +public class ConfigFileEditor extends ConfigPathEditor { + @Override public Object getValue() { ConfigFile c = new ConfigFile(null,value.toString()); return c; diff --git a/commons/src/main/java/org/archive/spring/ConfigPathEditor.java b/commons/src/main/java/org/archive/spring/ConfigPathEditor.java index 03b63ca1a..531b3adce 100644 --- a/commons/src/main/java/org/archive/spring/ConfigPathEditor.java +++ b/commons/src/main/java/org/archive/spring/ConfigPathEditor.java @@ -29,63 +29,75 @@ * PropertyEditor allowing Strings to become ConfigPath instances. * */ -public class ConfigPathEditor implements PropertyEditor { +public class ConfigPathEditor implements PropertyEditor { protected Object value; + @Override public void addPropertyChangeListener(PropertyChangeListener listener) { // TODO Auto-generated method stub } + @Override public String getAsText() { // TODO Auto-generated method stub return null; } + @Override public Component getCustomEditor() { // TODO Auto-generated method stub return null; } + @Override public String getJavaInitializationString() { // TODO Auto-generated method stub return null; } + @Override public String[] getTags() { // TODO Auto-generated method stub return null; } + @Override public Object getValue() { ConfigPath c = new ConfigPath(null,value.toString()); //c.put(value); return c; } + @Override public boolean isPaintable() { // TODO Auto-generated method stub return false; } + @Override public void paintValue(Graphics gfx, Rectangle box) { // TODO Auto-generated method stub } + @Override public void removePropertyChangeListener(PropertyChangeListener listener) { // TODO Auto-generated method stub } + @Override public void setAsText(String text) throws IllegalArgumentException { setValue(text); } + @Override public void setValue(Object value) { this.value = value; } + @Override public boolean supportsCustomEditor() { // TODO Auto-generated method stub return false; diff --git a/commons/src/main/java/org/archive/util/ArchiveUtils.java b/commons/src/main/java/org/archive/util/ArchiveUtils.java index 614cae76b..fce854d1f 100644 --- a/commons/src/main/java/org/archive/util/ArchiveUtils.java +++ b/commons/src/main/java/org/archive/util/ArchiveUtils.java @@ -749,13 +749,12 @@ public static String shortReportLine(Reporter rep) { * @param obj Object to prettify * @return prettified String */ - @SuppressWarnings("unchecked") public static String prettyString(Object obj) { // these things have to checked and casted unfortunately if (obj instanceof Object[]) { return prettyString((Object[]) obj); } else if (obj instanceof Map) { - return prettyString((Map) obj); + return prettyString((Map) obj); } else { return "<"+obj+">"; } @@ -767,8 +766,7 @@ public static String prettyString(Object obj) { * @param Map * @return prettified (in curly brackets) string of Map contents */ - @SuppressWarnings("unchecked") - public static String prettyString(Map map) { + public static String prettyString(Map map) { StringBuilder builder = new StringBuilder(); builder.append("{ "); boolean needsComma = false; diff --git a/commons/src/main/java/org/archive/util/ObjectIdentityBdbCache.java b/commons/src/main/java/org/archive/util/ObjectIdentityBdbCache.java index 0a6d1099d..a4fc257fc 100644 --- a/commons/src/main/java/org/archive/util/ObjectIdentityBdbCache.java +++ b/commons/src/main/java/org/archive/util/ObjectIdentityBdbCache.java @@ -151,7 +151,6 @@ public ObjectIdentityBdbCache() { * @param classCatalog * @throws DatabaseException */ - @SuppressWarnings("unchecked") public void initialize(final Environment env, String dbName, final Class valueClass, final StoredClassCatalog classCatalog) throws DatabaseException { @@ -523,10 +522,9 @@ final public V doctoredGet() { private static class SoftEntry extends SoftReference { PhantomEntry phantom; - @SuppressWarnings("unchecked") public SoftEntry(String key, V referent, ReferenceQueue q) { super(referent, q); - this.phantom = new PhantomEntry(key, referent); // unchecked cast + this.phantom = new PhantomEntry(key, referent); } public V get() { diff --git a/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java b/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java index 70cd213c9..84504e79d 100644 --- a/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java +++ b/commons/src/main/java/org/archive/util/ObjectIdentityBdbManualCache.java @@ -124,7 +124,6 @@ public ObjectIdentityBdbManualCache() { * @param classCatalog * @throws DatabaseException */ - @SuppressWarnings("unchecked") public void initialize(final Environment env, String dbName, final Class valueClass, final StoredClassCatalog classCatalog) throws DatabaseException { diff --git a/commons/src/main/java/org/archive/util/PrefixFinder.java b/commons/src/main/java/org/archive/util/PrefixFinder.java index 098a8b5b7..9d22b4c1f 100644 --- a/commons/src/main/java/org/archive/util/PrefixFinder.java +++ b/commons/src/main/java/org/archive/util/PrefixFinder.java @@ -76,18 +76,17 @@ public static List find(SortedSet set, String input) { } - @SuppressWarnings("unchecked") protected static SortedSet headSetInclusive(SortedSet set, String input) { // use NavigableSet inclusive version if available if(set instanceof NavigableSet) { - return ((NavigableSet)set).headSet(input, true); + return ((NavigableSet)set).headSet(input, true); } // use Stored*Set inclusive version if available if(set instanceof StoredSortedKeySet) { - return ((StoredSortedKeySet)set).headSet(input, true); + return ((StoredSortedKeySet)set).headSet(input, true); } if(set instanceof StoredSortedValueSet) { - return ((StoredSortedValueSet)set).headSet(input, true); + return ((StoredSortedValueSet)set).headSet(input, true); } // Use synthetic "one above" trick // NOTE: because '\0' sorts in the middle in "java modified UTF-8", @@ -125,15 +124,14 @@ public static List findKeys(SortedMap map, String input) { } - @SuppressWarnings("unchecked") private static SortedMap headMapInclusive(SortedMap map, String input) { // use NavigableMap inclusive version if available if(map instanceof NavigableMap) { - return ((NavigableMap)map).headMap(input, true); + return ((NavigableMap)map).headMap(input, true); } // use StoredSortedMap inclusive version if available if(map instanceof StoredSortedMap) { - return ((StoredSortedMap)map).headMap(input, true); + return ((StoredSortedMap)map).headMap(input, true); } // Use synthetic "one above" trick // NOTE: because '\0' sorts in the middle in "java modified UTF-8", diff --git a/commons/src/main/java/st/ata/util/FPGenerator.java b/commons/src/main/java/st/ata/util/FPGenerator.java index e742e4c38..20a8702d3 100644 --- a/commons/src/main/java/st/ata/util/FPGenerator.java +++ b/commons/src/main/java/st/ata/util/FPGenerator.java @@ -42,9 +42,7 @@ and use reduce to reduce to a fingerprint after the loop. */ - // Tested by: TestFPGenerator -@SuppressWarnings("unchecked") public final class FPGenerator { /** Return a fingerprint generator. The fingerprints generated @@ -64,7 +62,7 @@ public static FPGenerator make(long polynomial, int degree) { } return fpgen; } - private static final Hashtable generators = new Hashtable(10); + private static final Hashtable generators = new Hashtable(10); private static final long zero = 0; private static final long one = 0x8000000000000000L; diff --git a/commons/src/test/java/org/archive/settings/file/PrefixFinderTest.java b/commons/src/test/java/org/archive/settings/file/PrefixFinderTest.java index e8563b695..035149fb6 100644 --- a/commons/src/test/java/org/archive/settings/file/PrefixFinderTest.java +++ b/commons/src/test/java/org/archive/settings/file/PrefixFinderTest.java @@ -74,7 +74,6 @@ public void testSortedMap() { testUrlsNoMatch(map); } - @SuppressWarnings("unchecked") public void testStoredSortedMap() throws Exception { EnvironmentConfig config = new EnvironmentConfig(); config.setAllowCreate(true); @@ -89,7 +88,7 @@ public void testStoredSortedMap() throws Exception { dbConfig.setDeferredWrite(true); Database db = bdbEnvironment.openDatabase(null, "test", dbConfig); - StoredSortedMap ssm = new StoredSortedMap(db, new StringBinding(), new StringBinding(), true); + StoredSortedMap ssm = new StoredSortedMap(db, new StringBinding(), new StringBinding(), true); testUrlsNoMatch(ssm); db.close(); bdbEnvironment.close(); diff --git a/engine/src/main/java/org/archive/crawler/framework/CheckpointValidator.java b/engine/src/main/java/org/archive/crawler/framework/CheckpointValidator.java index 765b7bb55..7c258d39b 100644 --- a/engine/src/main/java/org/archive/crawler/framework/CheckpointValidator.java +++ b/engine/src/main/java/org/archive/crawler/framework/CheckpointValidator.java @@ -25,8 +25,7 @@ public class CheckpointValidator implements Validator { @Override - @SuppressWarnings("unchecked") - public boolean supports(Class cls) { + public boolean supports(Class cls) { return Checkpoint.class.isAssignableFrom(cls); } diff --git a/engine/src/main/java/org/archive/crawler/framework/CrawlLimitEnforcer.java b/engine/src/main/java/org/archive/crawler/framework/CrawlLimitEnforcer.java index 0c8901452..fc6f249b1 100644 --- a/engine/src/main/java/org/archive/crawler/framework/CrawlLimitEnforcer.java +++ b/engine/src/main/java/org/archive/crawler/framework/CrawlLimitEnforcer.java @@ -33,7 +33,7 @@ * * @contributor gojomo */ -public class CrawlLimitEnforcer implements ApplicationListener { +public class CrawlLimitEnforcer implements ApplicationListener { /** * Maximum number of bytes to download. Once this number is exceeded @@ -80,6 +80,7 @@ public void setCrawlController(CrawlController controller) { this.controller = controller; } + @Override public void onApplicationEvent(ApplicationEvent event) { if(event instanceof StatSnapshotEvent) { CrawlStatSnapshot snapshot = ((StatSnapshotEvent)event).getSnapshot(); diff --git a/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java b/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java index c9df326ed..3b1cba657 100644 --- a/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java +++ b/engine/src/main/java/org/archive/crawler/frontier/AbstractFrontier.java @@ -88,7 +88,7 @@ public abstract class AbstractFrontier HasKeyedProperties, ExtractorParameters, CrawlUriReceiver, - ApplicationListener { + ApplicationListener { private static final long serialVersionUID = 555881755284996860L; private static final Logger logger = Logger .getLogger(AbstractFrontier.class.getName()); @@ -1130,6 +1130,7 @@ public String shortReportLine() { return ArchiveUtils.shortReportLine(this); } + @Override public void onApplicationEvent(ApplicationEvent event) { if(event instanceof CrawlStateEvent) { CrawlStateEvent event1 = (CrawlStateEvent)event; diff --git a/engine/src/main/java/org/archive/crawler/frontier/precedence/PrecedenceLoader.java b/engine/src/main/java/org/archive/crawler/frontier/precedence/PrecedenceLoader.java index 7031b99e9..b54ea9ed7 100644 --- a/engine/src/main/java/org/archive/crawler/frontier/precedence/PrecedenceLoader.java +++ b/engine/src/main/java/org/archive/crawler/frontier/precedence/PrecedenceLoader.java @@ -96,7 +96,6 @@ public static void main(String[] args) throws DatabaseException, IOException { * @throws UnsupportedEncodingException * @throws IOException */ - @SuppressWarnings("unchecked") private static void main2args(String[] args) throws DatabaseException, FileNotFoundException, UnsupportedEncodingException, IOException { File source = new File(args[0]); @@ -110,16 +109,16 @@ private static void main2args(String[] args) throws DatabaseException, null, PersistProcessor.URI_HISTORY_DBNAME, PersistProcessor.HISTORY_DB_CONFIG.toDatabaseConfig()); - StoredSortedMap historyMap = new StoredSortedMap(historyDB, - new StringBinding(), new SerialBinding(classCatalog, - Map.class), true); + @SuppressWarnings({ "rawtypes", "unchecked" }) + StoredSortedMap historyMap = new StoredSortedMap(historyDB, + new StringBinding(), new SerialBinding(classCatalog, Map.class), true); int count = 0; if(source.isFile()) { // scan log, writing to database BufferedReader br = ArchiveUtils.getBufferedReader(source); - Iterator iter = new LineReadingIterator(br); + Iterator iter = new LineReadingIterator(br); while(iter.hasNext()) { String line = (String) iter.next(); String[] splits = line.split("\\s"); @@ -130,9 +129,10 @@ private static void main2args(String[] args) throws DatabaseException, } String key = PersistProcessor.persistKeyFor(uri); int precedence = Integer.parseInt(splits[1]); - Map map = (Map)historyMap.get(key); + @SuppressWarnings("unchecked") + Map map = (Map)historyMap.get(key); if (map==null) { - map = new HashMap(); + map = new HashMap(); } map.put(A_PRECALC_PRECEDENCE, precedence); historyMap.put(key,map); diff --git a/engine/src/main/java/org/archive/crawler/frontier/precedence/PreloadedUriPrecedencePolicy.java b/engine/src/main/java/org/archive/crawler/frontier/precedence/PreloadedUriPrecedencePolicy.java index f4362eada..3dc107678 100644 --- a/engine/src/main/java/org/archive/crawler/frontier/precedence/PreloadedUriPrecedencePolicy.java +++ b/engine/src/main/java/org/archive/crawler/frontier/precedence/PreloadedUriPrecedencePolicy.java @@ -66,29 +66,27 @@ public void setBdbModule(BdbModule bdb) { this.bdb = bdb; } - @SuppressWarnings("unchecked") - protected StoredSortedMap store; + protected StoredSortedMap store; protected Database historyDb; - @SuppressWarnings("unchecked") + @SuppressWarnings({ "unchecked", "rawtypes" }) public void start() { if(isRunning()) { return; - } + } + store = null; String dbName = PersistProcessor.URI_HISTORY_DBNAME; - StoredSortedMap historyMap; try { StoredClassCatalog classCatalog = bdb.getClassCatalog(); BdbModule.BdbConfig dbConfig = PersistProcessor.HISTORY_DB_CONFIG; - historyDb = bdb.openDatabase(dbName, dbConfig, true); - historyMap = new StoredSortedMap(historyDb, - new StringBinding(), new SerialBinding(classCatalog, - Map.class), true); + historyDb = bdb.openDatabase(dbName, dbConfig, true); + SerialBinding sb = new SerialBinding(classCatalog, Map.class); + StoredSortedMap historyMap = new StoredSortedMap(historyDb, new StringBinding(), sb, true); + store = historyMap; } catch (DatabaseException e) { throw new RuntimeException(e); } - store = historyMap; } public boolean isRunning() { @@ -141,11 +139,10 @@ protected int calculatePrecedence(CrawlURI curi) { * double-loading * @param curi CrawlURI to receive prior state data */ - @SuppressWarnings("unchecked") protected void mergePrior(CrawlURI curi) { - Map prior = null; String key = PersistProcessor.persistKeyFor(curi); - prior = (Map) store.get(key); + @SuppressWarnings({ "rawtypes", "unchecked" }) + Map prior = (Map) store.get(key); if(prior!=null) { // merge in keys curi.getData().putAll(prior); diff --git a/engine/src/main/java/org/archive/crawler/monitor/DiskSpaceMonitor.java b/engine/src/main/java/org/archive/crawler/monitor/DiskSpaceMonitor.java index 7afa3e129..ec13f78d5 100644 --- a/engine/src/main/java/org/archive/crawler/monitor/DiskSpaceMonitor.java +++ b/engine/src/main/java/org/archive/crawler/monitor/DiskSpaceMonitor.java @@ -31,7 +31,7 @@ * * @contributor Kristinn Sigurðsson */ -public class DiskSpaceMonitor implements ApplicationListener { +public class DiskSpaceMonitor implements ApplicationListener { private static final Logger logger = Logger.getLogger(DiskSpaceMonitor.class.getName()); protected List monitorPaths = new ArrayList(); diff --git a/engine/src/main/java/org/archive/crawler/restlet/JobRelatedResource.java b/engine/src/main/java/org/archive/crawler/restlet/JobRelatedResource.java index aa1bab8c2..c5d9efcc8 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/JobRelatedResource.java +++ b/engine/src/main/java/org/archive/crawler/restlet/JobRelatedResource.java @@ -23,7 +23,6 @@ import java.beans.PropertyDescriptor; import java.io.File; import java.io.PrintWriter; -import java.net.URLEncoder; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; @@ -177,7 +176,7 @@ protected void writeNestedNames(PrintWriter pw, Object obj, String prefix, Set)obj) { writeNestedNames(pw, next, prefix, alreadyWritten); } } @@ -411,7 +410,6 @@ private IdentityHashMap getBeanToNameMap() { * @param alreadyWritten Set of objects to not redundantly write * @param beanPathPrefix beanPath prefix to apply to sub fields browse links */ - @SuppressWarnings("unchecked") protected void writeObject(PrintWriter pw, String field, Object object, HashSet alreadyWritten, String beanPathPrefix) { String key = getBeanToNameMap().get(object); String close = ""; @@ -497,14 +495,15 @@ protected void writeObject(PrintWriter pw, String field, Object object, HashSet< writeObject(pw, i+"", list.get(i), alreadyWritten, beanPathPrefix); } } else if(object instanceof Iterable) { - for (Object next : (Iterable)object) { + @SuppressWarnings("unchecked") + Iterable itbl = (Iterable)object; + for (Object next : itbl) { writeObject(pw, "#", next, alreadyWritten, null); } } if(object instanceof Map) { - for (Object next : ((Map)object).entrySet()) { + for (Map.Entry entry : ((Map)object).entrySet()) { // TODO: protect against giant maps? - Map.Entry entry = (Map.Entry)next; if(beanPath!=null) { beanPathPrefix = beanPath+"["; } diff --git a/engine/src/main/java/org/archive/crawler/spring/SheetOverlaysManager.java b/engine/src/main/java/org/archive/crawler/spring/SheetOverlaysManager.java index 80775e19a..c25bfaeb7 100644 --- a/engine/src/main/java/org/archive/crawler/spring/SheetOverlaysManager.java +++ b/engine/src/main/java/org/archive/crawler/spring/SheetOverlaysManager.java @@ -53,7 +53,7 @@ * @contributor gojomo */ public class SheetOverlaysManager implements -BeanFactoryAware, OverlayMapsSource, ApplicationListener { +BeanFactoryAware, OverlayMapsSource, ApplicationListener { private static final Logger logger = Logger.getLogger(SheetOverlaysManager.class.getName()); @@ -186,6 +186,7 @@ public Map getOverlayMap(String name) { * properties. * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent) */ + @Override public void onApplicationEvent(ApplicationEvent event) { if(event instanceof ContextRefreshedEvent) { for(Sheet s: sheetsByName.values()) { diff --git a/modules/src/main/java/org/archive/modules/CrawlURI.java b/modules/src/main/java/org/archive/modules/CrawlURI.java index cfc01bf49..c923195cb 100644 --- a/modules/src/main/java/org/archive/modules/CrawlURI.java +++ b/modules/src/main/java/org/archive/modules/CrawlURI.java @@ -891,7 +891,7 @@ public Map getPersistentDataMap() { */ public Set getCredentials() { @SuppressWarnings("unchecked") - Set r = (Set)getData().get(A_CREDENTIALS_KEY); + Set r = (Set)getData().get(A_CREDENTIALS_KEY); if (r == null) { r = new HashSet(); getData().put(A_CREDENTIALS_KEY, r); @@ -1250,7 +1250,7 @@ public FetchType getFetchType() { public Collection getNonFatalFailures() { @SuppressWarnings("unchecked") - List list = (List)getData().get(A_NONFATAL_ERRORS); + List list = (List)getData().get(A_NONFATAL_ERRORS); if (list == null) { list = new ArrayList(); getData().put(A_NONFATAL_ERRORS, list); @@ -1505,7 +1505,7 @@ public void makeHeritable(String key) { */ public void makeNonHeritable(String key) { @SuppressWarnings("unchecked") - HashSet heritableKeys = (HashSet)data.get(A_HERITABLE_KEYS); + HashSet heritableKeys = (HashSet)data.get(A_HERITABLE_KEYS); if(heritableKeys == null) { return; } diff --git a/modules/src/main/java/org/archive/modules/canonicalize/StripSessionCFIDs.java b/modules/src/main/java/org/archive/modules/canonicalize/StripSessionCFIDs.java index 529e8a62b..c3332dc3d 100644 --- a/modules/src/main/java/org/archive/modules/canonicalize/StripSessionCFIDs.java +++ b/modules/src/main/java/org/archive/modules/canonicalize/StripSessionCFIDs.java @@ -18,7 +18,6 @@ */ package org.archive.modules.canonicalize; -import java.util.regex.Pattern; /** * Strip cold fusion session ids. diff --git a/modules/src/main/java/org/archive/modules/canonicalize/StripSessionIDs.java b/modules/src/main/java/org/archive/modules/canonicalize/StripSessionIDs.java index ec3ad1193..692759993 100644 --- a/modules/src/main/java/org/archive/modules/canonicalize/StripSessionIDs.java +++ b/modules/src/main/java/org/archive/modules/canonicalize/StripSessionIDs.java @@ -18,8 +18,6 @@ */ package org.archive.modules.canonicalize; -import java.util.regex.Pattern; - /** * Strip known session ids. * @author stack diff --git a/modules/src/main/java/org/archive/modules/extractor/CustomSWFTags.java b/modules/src/main/java/org/archive/modules/extractor/CustomSWFTags.java index b0f61ada5..987a23edc 100644 --- a/modules/src/main/java/org/archive/modules/extractor/CustomSWFTags.java +++ b/modules/src/main/java/org/archive/modules/extractor/CustomSWFTags.java @@ -34,7 +34,6 @@ * * @author Igor Ranitovic */ -@SuppressWarnings("unchecked") public class CustomSWFTags extends SWFTagTypesImpl { protected SWFActions actions; @@ -43,18 +42,21 @@ public CustomSWFTags(SWFActions a) { actions = a; } - public SWFActions tagDefineButton(int id, Vector buttonRecords) + @Override + public SWFActions tagDefineButton(int id, @SuppressWarnings("rawtypes") Vector buttonRecords) throws IOException { return actions; } + @Override public SWFActions tagDefineButton2(int id, boolean trackAsMenu, - Vector buttonRecord2s) throws IOException { + @SuppressWarnings("rawtypes") Vector buttonRecord2s) throws IOException { return actions; } + @Override public SWFActions tagDoAction() throws IOException { return actions; } @@ -63,10 +65,12 @@ public SWFActions tagDoInActions(int spriteId) throws IOException { return actions; } + @Override public SWFTagTypes tagDefineSprite(int id) throws IOException { return this; } + @Override public SWFActions tagPlaceObject2(boolean isMove, int clipDepth, int depth, int charId, Matrix matrix, AlphaTransform cxform, int ratio, String name, int clipActionFlags) throws IOException { diff --git a/modules/src/main/java/org/archive/modules/extractor/ExtractorJS.java b/modules/src/main/java/org/archive/modules/extractor/ExtractorJS.java index 994b0a1d6..133b152e7 100644 --- a/modules/src/main/java/org/archive/modules/extractor/ExtractorJS.java +++ b/modules/src/main/java/org/archive/modules/extractor/ExtractorJS.java @@ -58,7 +58,6 @@ public class ExtractorJS extends ContentExtractor { private static final long serialVersionUID = 2L; - @SuppressWarnings("unused") private static Logger LOGGER = Logger.getLogger("org.archive.crawler.extractor.ExtractorJS"); diff --git a/modules/src/main/java/org/archive/modules/extractor/JerichoExtractorHTML.java b/modules/src/main/java/org/archive/modules/extractor/JerichoExtractorHTML.java index 3fcbed636..5b782da32 100644 --- a/modules/src/main/java/org/archive/modules/extractor/JerichoExtractorHTML.java +++ b/modules/src/main/java/org/archive/modules/extractor/JerichoExtractorHTML.java @@ -49,7 +49,6 @@ import au.id.jericho.lib.html.FormControl; import au.id.jericho.lib.html.FormControlType; import au.id.jericho.lib.html.FormField; -import au.id.jericho.lib.html.FormFields; import au.id.jericho.lib.html.HTMLElementName; import au.id.jericho.lib.html.Source; import au.id.jericho.lib.html.StartTagType; @@ -94,7 +93,7 @@ public JerichoExtractorHTML(String name) { "parser, the Jericho HTML Parser, reads the whole " + "document into memory for " + "parsing - thus this extractor has an inherent OOME risk. " + - "This OOME risk can be reduced/eleminated by limiting the " + + "This OOME risk can be reduced/eliminated by limiting the " + "size of documents to be parsed (i.e. using " + "NotExceedsDocumentLengthTresholdDecideRule). "); }*/ @@ -105,8 +104,7 @@ public JerichoExtractorHTML() { private static List findOnAttributes(Attributes attributes) { List result = new LinkedList(); - for (Iterator attrIter = attributes.iterator(); attrIter.hasNext();) { - Attribute attr = (Attribute) attrIter.next(); + for (Attribute attr : (Iterable)attributes) { if (attr.getKey().startsWith("on")) result.add(attr); } @@ -118,7 +116,7 @@ protected void processGeneralTag(CrawlURI curi, Element element, Attributes attributes) { Attribute attr; String attrValue; - List attrList; + List attrList; String elementName = element.getName(); // Just in case it's an OBJECT or APPLET tag @@ -163,7 +161,7 @@ protected void processGeneralTag(CrawlURI curi, Element element, } // ON_ if ((attrList = findOnAttributes(attributes)).size() != 0) { - for (Iterator attrIter = attrList.iterator(); attrIter.hasNext();) { + for (Iterator attrIter = attrList.iterator(); attrIter.hasNext();) { attr = (Attribute) attrIter.next(); CharSequence valueSegment = attr.getValueSegment(); if (valueSegment != null) @@ -370,21 +368,14 @@ protected void processForm(CrawlURI curi, Element element) { numberOfFormsProcessed.incrementAndGet(); // get all form fields - FormFields formFields = element.findFormFields(); - for (Iterator fieldsIter = formFields.iterator(); fieldsIter.hasNext();) { - // for each form field - FormField formField = (FormField) fieldsIter.next(); - + for (FormField formField : (Iterable)element.findFormFields()) { // for each form control - for (Iterator controlIter = formField.getFormControls().iterator(); - controlIter.hasNext();) { - FormControl formControl = (FormControl) controlIter.next(); - + for (FormControl formControl : (Iterable)formField.getFormControls()) { // get name of control element (and URLEncode it) String controlName = formControl.getName(); // retrieve list of values - submit needs special handling - Collection controlValues; + Collection controlValues; if (!(formControl.getFormControlType() == FormControlType.SUBMIT)) { controlValues = formControl.getValues(); @@ -394,9 +385,7 @@ protected void processForm(CrawlURI curi, Element element) { if (controlValues.size() > 0) { // for each value set - for (Iterator valueIter = controlValues.iterator(); - valueIter.hasNext();) { - String value = (String) valueIter.next(); + for (String value : controlValues) { queryURL += "&" + controlName + "=" + value; } } else { @@ -430,10 +419,8 @@ protected void processForm(CrawlURI curi, Element element) { */ protected void extract(CrawlURI curi, CharSequence cs) { Source source = new Source(cs); - List elements = source.findAllElements(StartTagType.NORMAL); - for (Iterator elementIter = elements.iterator(); - elementIter.hasNext();) { - Element element = (Element) elementIter.next(); + List elements = source.findAllElements(StartTagType.NORMAL); + for (Element element : elements) { String elementName = element.getName(); Attributes attributes; if (elementName.equals(HTMLElementName.META)) { diff --git a/modules/src/main/java/org/archive/modules/extractor/PDFParser.java b/modules/src/main/java/org/archive/modules/extractor/PDFParser.java index 9a44d59b8..8aa07cde0 100644 --- a/modules/src/main/java/org/archive/modules/extractor/PDFParser.java +++ b/modules/src/main/java/org/archive/modules/extractor/PDFParser.java @@ -199,7 +199,6 @@ protected void extractURIs(PdfObject entity){ PdfDictionary dictionary= (PdfDictionary)entity; - @SuppressWarnings("unchecked") Set allkeys = dictionary.getKeys(); for (PdfName key: allkeys) { PdfObject value = dictionary.get(key); @@ -219,11 +218,8 @@ protected void extractURIs(PdfObject entity){ }else if(entity.isArray()){ PdfArray array = (PdfArray)entity; - ArrayList arrayObjects = array.getArrayList(); - Iterator objectList = arrayObjects.iterator(); - - while(objectList.hasNext()){ - this.extractURIs( (PdfObject)objectList.next()); + for (PdfObject pdfObject : (Iterable)array.getArrayList()) { + this.extractURIs(pdfObject); } // deal with indirect references diff --git a/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java b/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java index c339b0f44..a92fe1ea9 100644 --- a/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java +++ b/modules/src/main/java/org/archive/modules/fetcher/FetchHTTP.java @@ -743,14 +743,14 @@ protected void readResponseBody(HttpState state, * @param curi CrawlURI * @param rec HttpRecorder */ - @SuppressWarnings("unchecked") protected void setSizes(CrawlURI curi, Recorder rec) { // set reporting size curi.setContentSize(rec.getRecordedInput().getSize()); // special handling for 304-not modified if (curi.getFetchStatus() == HttpStatus.SC_NOT_MODIFIED && curi.containsDataKey(A_FETCH_HISTORY)) { - Map history[] = (Map[])curi.getData().get(A_FETCH_HISTORY); + @SuppressWarnings("unchecked") + Map history[] = (Map[])curi.getData().get(A_FETCH_HISTORY); if (history[0] != null && history[0] .containsKey(A_REFERENCE_LENGTH)) { @@ -1024,12 +1024,12 @@ protected HostConfiguration configureMethod(CrawlURI curi, * @param sourceHeader header to consult in URI history * @param targetHeader header to set if possible */ - @SuppressWarnings("unchecked") protected void setConditionalGetHeader(CrawlURI curi, HttpMethod method, boolean conditional, String sourceHeader, String targetHeader) { if (conditional) { try { - Map[] history = (Map[])curi.getData().get(A_FETCH_HISTORY); + @SuppressWarnings("unchecked") + Map[] history = (Map[])curi.getData().get(A_FETCH_HISTORY); int previousStatus = (Integer) history[0].get(A_STATUS); if(previousStatus<=0) { // do not reuse headers from any broken fetch @@ -1261,7 +1261,6 @@ protected void handle401(final HttpMethod method, final CrawlURI curi) { * CrawlURI that got a 401. * @return Returns first wholesome authscheme found else null. */ - @SuppressWarnings("unchecked") protected AuthScheme getAuthScheme(final HttpMethod method, final CrawlURI curi) { Header[] headers = method.getResponseHeaders("WWW-Authenticate"); @@ -1271,9 +1270,11 @@ protected AuthScheme getAuthScheme(final HttpMethod method, return null; } - Map authschemes = null; + Map authschemes = null; try { - authschemes = AuthChallengeParser.parseChallenges(headers); + @SuppressWarnings("unchecked") + Map parsedChallenges = AuthChallengeParser.parseChallenges(headers); + authschemes = parsedChallenges; } catch (MalformedChallengeException e) { logger.fine("Failed challenge parse: " + e.getMessage()); } @@ -1285,7 +1286,7 @@ protected AuthScheme getAuthScheme(final HttpMethod method, AuthScheme result = null; // Use the first auth found. - for (Iterator i = authschemes.keySet().iterator(); result == null + for (Iterator i = authschemes.keySet().iterator(); result == null && i.hasNext();) { String key = (String) i.next(); String challenge = (String) authschemes.get(key); @@ -1377,7 +1378,6 @@ public void stop() { super.stop(); // At the end save cookies to the file specified in the order file. if (cookieStorage != null) { - @SuppressWarnings("unchecked") Map map = http.getState().getCookiesMap(); cookieStorage.saveCookiesMap(map); cookieStorage.stop(); diff --git a/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java b/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java index c3282b0cf..24bb50743 100644 --- a/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java +++ b/modules/src/main/java/org/archive/modules/recrawl/FetchHistoryProcessor.java @@ -57,7 +57,6 @@ public void setHistoryLength(int length) { public FetchHistoryProcessor() { } - @SuppressWarnings("unchecked") @Override protected void innerProcess(CrawlURI puri) throws InterruptedException { CrawlURI curi = (CrawlURI) puri; @@ -92,12 +91,14 @@ protected void innerProcess(CrawlURI puri) throws InterruptedException { // get or create proper-sized history array int targetHistoryLength = getHistoryLength(); - HashMap[] history = - (HashMap[]) (curi.containsDataKey(A_FETCH_HISTORY) + @SuppressWarnings("unchecked") + HashMap[] history = + (HashMap[]) (curi.containsDataKey(A_FETCH_HISTORY) ? curi.getData().get(A_FETCH_HISTORY) : new HashMap[targetHistoryLength]); if(history.length != targetHistoryLength) { - HashMap[] newHistory = new HashMap[targetHistoryLength]; + @SuppressWarnings("unchecked") + HashMap[] newHistory = new HashMap[targetHistoryLength]; System.arraycopy( history,0, newHistory,0, diff --git a/modules/src/main/java/org/archive/modules/recrawl/PersistLoadProcessor.java b/modules/src/main/java/org/archive/modules/recrawl/PersistLoadProcessor.java index b9220fcd1..2dc2f8c4e 100644 --- a/modules/src/main/java/org/archive/modules/recrawl/PersistLoadProcessor.java +++ b/modules/src/main/java/org/archive/modules/recrawl/PersistLoadProcessor.java @@ -80,10 +80,10 @@ public void setPreloadSourceUrl(String preloadSourceUrl) { this.preloadSourceUrl = preloadSourceUrl; } - @SuppressWarnings("unchecked") @Override protected void innerProcess(CrawlURI curi) throws InterruptedException { String pkey = persistKeyFor(curi); + @SuppressWarnings("unchecked") Map prior = (Map) store.get(pkey); if(prior!=null) { diff --git a/modules/src/main/java/org/archive/modules/writer/MirrorWriterProcessor.java b/modules/src/main/java/org/archive/modules/writer/MirrorWriterProcessor.java index 0ae482e24..5080fad10 100644 --- a/modules/src/main/java/org/archive/modules/writer/MirrorWriterProcessor.java +++ b/modules/src/main/java/org/archive/modules/writer/MirrorWriterProcessor.java @@ -85,7 +85,6 @@ @author Howard Lee Gayle */ -@SuppressWarnings("unchecked") public class MirrorWriterProcessor extends Processor { private static final long serialVersionUID = 3L; private static final Logger logger = @@ -462,7 +461,7 @@ private URIToFileReturn dirPath(String baseDir, String host, int port, If not, the last element is removed. @param list the list */ - private void ensurePairs(List list) { + private void ensurePairs(List list) { if (1 == (list.size() % 2)) { list.remove(list.size() - 1); } @@ -513,7 +512,7 @@ private URIToFileReturn uriToFile(String baseDir, CrawlURI curi) if ((null != ctm) && (ctm.size() > 1)) { ensurePairs(ctm); String contentType = curi.getContentType().toLowerCase(); - Iterator i = ctm.iterator(); + Iterator i = ctm.iterator(); for (boolean more = true; more && i.hasNext();) { String ct = (String) i.next(); String suf = (String) i.next(); @@ -542,7 +541,7 @@ private URIToFileReturn uriToFile(String baseDir, CrawlURI curi) ensurePairs(cm); characterMap = new HashMap(cm.size()); // Above will be half full. - for (Iterator i = cm.iterator(); i.hasNext();) { + for (Iterator i = cm.iterator(); i.hasNext();) { String s1 = (String) i.next(); String s2 = (String) i.next(); if ((null != s1) && (1 == s1.length()) && (null != s2) @@ -628,15 +627,15 @@ file system path segment (component) @throws IOException if a needed directory could not be created @throws IOException - if a needed directory is not writeable + if a needed directory is not writable @throws IOException if a non-directory file exists with the same path as a needed directory */ private URIToFileReturn uriToFile(CrawlURI curi, String host, int port, String uriPath, String query, String suffix, String baseDir, int maxSegLen, int maxPathLen, boolean caseSensitive, - String dirFile, Map characterMap, String dotBegin, String dotEnd, - String tooLongDir, boolean suffixAtEnd, Set underscoreSet) + String dirFile, Map characterMap, String dotBegin, String dotEnd, + String tooLongDir, boolean suffixAtEnd, Set underscoreSet) throws IOException { assert (null == host) || (0 != host.length()); assert 0 != uriPath.length(); @@ -904,7 +903,7 @@ This class represents one directory segment (component) of a URI path. */ class DirSegment extends PathSegment { /** If a segment name is in this set, prepend an underscore.*/ - private Set underscoreSet; + private Set underscoreSet; /** Creates a DirSegment. @@ -937,8 +936,8 @@ file system path segment (component) maxSegLen is too small. */ DirSegment(String uriPath, int beginIndex, int endIndex, int maxSegLen, - boolean caseSensitive, CrawlURI curi, Map characterMap, - String dotBegin, String dotEnd, Set underscoreSet) { + boolean caseSensitive, CrawlURI curi, Map characterMap, + String dotBegin, String dotEnd, Set underscoreSet) { super(maxSegLen, caseSensitive, curi); mainPart = new LumpyString(uriPath, beginIndex, endIndex, (null == dotEnd) ? 0 : dotEnd.length(), @@ -1126,7 +1125,7 @@ file system path segment (component) maxSegLen is too small. */ EndSegment(String uriPath, int beginIndex, int endIndex, int maxSegLen, - boolean caseSensitive, CrawlURI curi, Map characterMap, + boolean caseSensitive, CrawlURI curi, Map characterMap, String dotBegin, String query, String suffix, int maxPathLen, boolean suffixAtEnd) { super(maxSegLen - 1, caseSensitive, curi); @@ -1413,7 +1412,7 @@ class LumpyString { dotBegin is non-null but empty. */ LumpyString(String str, int beginIndex, int endIndex, int padding, - int maxLen, Map characterMap, String dotBegin) { + int maxLen, Map characterMap, String dotBegin) { if (beginIndex < 0) { throw new IllegalArgumentException("beginIndex < 0: " + beginIndex); diff --git a/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java b/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java index 09dd6d1d1..dcd5d4fca 100644 --- a/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java +++ b/modules/src/main/java/org/archive/modules/writer/WriterPoolProcessor.java @@ -62,7 +62,6 @@ public abstract class WriterPoolProcessor extends Processor implements Lifecycle, Checkpointable, WriterPoolSettings { private static final long serialVersionUID = 1L; - @SuppressWarnings("unused") private static final Logger logger = Logger.getLogger(WriterPoolProcessor.class.getName());