From e678777972798fb1f3544a895159204d257e5cd4 Mon Sep 17 00:00:00 2001 From: Sebastian Nagel Date: Fri, 4 Oct 2024 16:47:41 +0200 Subject: [PATCH] NUTCH-3073 Address Java compiler warning - add missing type arguments (Collections, etc.) - remove unnecessary casts - remove unused variables --- src/java/org/apache/nutch/service/NutchReader.java | 8 ++++---- .../org/apache/nutch/service/impl/LinkReader.java | 14 +++++++------- .../org/apache/nutch/service/impl/NodeReader.java | 12 ++++++------ .../indexer/arbitrary/ArbitraryIndexingFilter.java | 2 +- .../indexer/basic/TestBasicIndexingFilter.java | 2 +- .../parse/tika/BoilerpipeExtractorRepository.java | 2 +- .../scoring/metadata/MetadataScoringFilter.java | 1 - .../metadata/TestMetadataScoringFilter.java | 2 +- .../apache/nutch/collection/CollectionManager.java | 12 ++++++------ .../org/apache/nutch/crawl/CrawlDbUpdateUtil.java | 5 ++--- .../org/apache/nutch/crawl/TestCrawlDbStates.java | 4 ++-- 11 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/java/org/apache/nutch/service/NutchReader.java b/src/java/org/apache/nutch/service/NutchReader.java index 98d7141a99..8d77254244 100644 --- a/src/java/org/apache/nutch/service/NutchReader.java +++ b/src/java/org/apache/nutch/service/NutchReader.java @@ -25,14 +25,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public interface NutchReader { +public interface NutchReader { static final Logger LOG = LoggerFactory .getLogger(MethodHandles.lookup().lookupClass()); public static final Configuration conf = NutchConfiguration.create(); - public List read(String path) throws FileNotFoundException; - public List head(String path, int nrows) throws FileNotFoundException; - public List slice(String path, int start, int end) throws FileNotFoundException; + public List read(String path) throws FileNotFoundException; + public List head(String path, int nrows) throws FileNotFoundException; + public List slice(String path, int start, int end) throws FileNotFoundException; public int count(String path) throws FileNotFoundException; } diff --git a/src/java/org/apache/nutch/service/impl/LinkReader.java b/src/java/org/apache/nutch/service/impl/LinkReader.java index f3e54a3cc5..59d84509a6 100644 --- a/src/java/org/apache/nutch/service/impl/LinkReader.java +++ b/src/java/org/apache/nutch/service/impl/LinkReader.java @@ -33,11 +33,11 @@ import org.apache.nutch.scoring.webgraph.LinkDatum; import org.apache.nutch.service.NutchReader; -public class LinkReader implements NutchReader{ +public class LinkReader implements NutchReader { @Override - public List read(String path) throws FileNotFoundException { - List rows= new ArrayList<>(); + public List> read(String path) throws FileNotFoundException { + List> rows= new ArrayList<>(); Path file = new Path(path); SequenceFile.Reader reader; try{ @@ -69,8 +69,8 @@ public List read(String path) throws FileNotFoundException { } @Override - public List head(String path, int nrows) throws FileNotFoundException { - List rows= new ArrayList<>(); + public List> head(String path, int nrows) throws FileNotFoundException { + List> rows= new ArrayList<>(); Path file = new Path(path); SequenceFile.Reader reader; try{ @@ -101,9 +101,9 @@ public List head(String path, int nrows) throws FileNotFoundException { } @Override - public List slice(String path, int start, int end) + public List> slice(String path, int start, int end) throws FileNotFoundException { - List rows= new ArrayList<>(); + List> rows= new ArrayList<>(); Path file = new Path(path); SequenceFile.Reader reader; try{ diff --git a/src/java/org/apache/nutch/service/impl/NodeReader.java b/src/java/org/apache/nutch/service/impl/NodeReader.java index 612fa264f3..efa94f2329 100644 --- a/src/java/org/apache/nutch/service/impl/NodeReader.java +++ b/src/java/org/apache/nutch/service/impl/NodeReader.java @@ -36,8 +36,8 @@ public class NodeReader implements NutchReader { @Override - public List read(String path) throws FileNotFoundException { - List rows= new ArrayList<>(); + public List> read(String path) throws FileNotFoundException { + List> rows= new ArrayList<>(); Path file = new Path(path); SequenceFile.Reader reader; try{ @@ -70,8 +70,8 @@ public List read(String path) throws FileNotFoundException { } @Override - public List head(String path, int nrows) throws FileNotFoundException { - List rows= new ArrayList<>(); + public List> head(String path, int nrows) throws FileNotFoundException { + List> rows= new ArrayList<>(); Path file = new Path(path); SequenceFile.Reader reader; try{ @@ -102,9 +102,9 @@ public List head(String path, int nrows) throws FileNotFoundException { } @Override - public List slice(String path, int start, int end) + public List> slice(String path, int start, int end) throws FileNotFoundException { - List rows= new ArrayList<>(); + List> rows= new ArrayList<>(); Path file = new Path(path); SequenceFile.Reader reader; try{ diff --git a/src/plugin/index-arbitrary/src/java/org/apache/nutch/indexer/arbitrary/ArbitraryIndexingFilter.java b/src/plugin/index-arbitrary/src/java/org/apache/nutch/indexer/arbitrary/ArbitraryIndexingFilter.java index 21a4537bf6..6fd6a3ac78 100644 --- a/src/plugin/index-arbitrary/src/java/org/apache/nutch/indexer/arbitrary/ArbitraryIndexingFilter.java +++ b/src/plugin/index-arbitrary/src/java/org/apache/nutch/indexer/arbitrary/ArbitraryIndexingFilter.java @@ -153,7 +153,7 @@ public class ArbitraryIndexingFilter implements IndexingFilter { public NutchDocument filter(NutchDocument doc, Parse parse, Text url, CrawlDatum datum, Inlinks inlinks) throws IndexingException { - Class theClass = null; + Class theClass = null; Method theMethod = null; Constructor theConstructor = null; Object instance = null; diff --git a/src/plugin/index-basic/src/test/org/apache/nutch/indexer/basic/TestBasicIndexingFilter.java b/src/plugin/index-basic/src/test/org/apache/nutch/indexer/basic/TestBasicIndexingFilter.java index 280bec3a32..3684c9907b 100644 --- a/src/plugin/index-basic/src/test/org/apache/nutch/indexer/basic/TestBasicIndexingFilter.java +++ b/src/plugin/index-basic/src/test/org/apache/nutch/indexer/basic/TestBasicIndexingFilter.java @@ -93,6 +93,6 @@ public void testBasicIndexingFilter() throws Exception { Assert.assertEquals("test content", "this is a sample foo", doc.getField("content").getValues().get(0)); Assert.assertEquals("test fetch time", new Date(100L), - (Date) doc.getField("tstamp").getValues().get(0)); + doc.getField("tstamp").getValues().get(0)); } } diff --git a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java index 23e8ddb24e..03c4932878 100644 --- a/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java +++ b/src/plugin/parse-tika/src/java/org/apache/nutch/parse/tika/BoilerpipeExtractorRepository.java @@ -41,7 +41,7 @@ public static synchronized BoilerpipeExtractor getExtractor(String boilerpipeExt // Attempt to load the class try { ClassLoader loader = BoilerpipeExtractor.class.getClassLoader(); - Class extractorClass = loader.loadClass(boilerpipeExtractorName); + Class extractorClass = loader.loadClass(boilerpipeExtractorName); // Add an instance to the repository extractorRepository.put(boilerpipeExtractorName, (BoilerpipeExtractor)extractorClass.getConstructor().newInstance()); diff --git a/src/plugin/scoring-metadata/src/java/org/apache/nutch/scoring/metadata/MetadataScoringFilter.java b/src/plugin/scoring-metadata/src/java/org/apache/nutch/scoring/metadata/MetadataScoringFilter.java index 4679976376..26cbaa4c3e 100644 --- a/src/plugin/scoring-metadata/src/java/org/apache/nutch/scoring/metadata/MetadataScoringFilter.java +++ b/src/plugin/scoring-metadata/src/java/org/apache/nutch/scoring/metadata/MetadataScoringFilter.java @@ -44,7 +44,6 @@ public class MetadataScoringFilter extends AbstractScoringFilter { private static String[] datumMetadata; private static String[] contentMetadata; private static String[] parseMetadata; - private Configuration conf; /** * This will take the metadata that you have listed in your "scoring.parse.md" diff --git a/src/plugin/scoring-metadata/src/test/org/apache/nutch/scoring/metadata/TestMetadataScoringFilter.java b/src/plugin/scoring-metadata/src/test/org/apache/nutch/scoring/metadata/TestMetadataScoringFilter.java index d125f55efe..0112239586 100644 --- a/src/plugin/scoring-metadata/src/test/org/apache/nutch/scoring/metadata/TestMetadataScoringFilter.java +++ b/src/plugin/scoring-metadata/src/test/org/apache/nutch/scoring/metadata/TestMetadataScoringFilter.java @@ -50,7 +50,7 @@ public void distributeScoreToOutlinks() throws ScoringFilterException { parseData.getParseMeta().add("parent",parentMD); parseData.getParseMeta().add("depth",depthMD); - HashMap targets = new HashMap(); + HashMap targets = new HashMap<>(); targets.put(new Text("https://nutch.apache.org/downloads.html"),new CrawlDatum()); targets.put(new Text("https://wiki.apache.org/nutch"),new CrawlDatum()); diff --git a/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java b/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java index 79e03b686a..00e8c644b1 100644 --- a/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java +++ b/src/plugin/subcollection/src/java/org/apache/nutch/collection/CollectionManager.java @@ -133,7 +133,7 @@ public static CollectionManager getCollectionManager(Configuration conf) { * @return Named SubCollection (or null if not existing) */ public Subcollection getSubColection(final String id) { - return (Subcollection) collectionMap.get(id); + return collectionMap.get(id); } /** @@ -180,10 +180,10 @@ public Subcollection createSubCollection(final String id, final String name) { */ public List getSubCollections(final String url) { List collections = new ArrayList(); - final Iterator iterator = collectionMap.values().iterator(); + final Iterator iterator = collectionMap.values().iterator(); while (iterator.hasNext()) { - final Subcollection subCol = (Subcollection) iterator.next(); + final Subcollection subCol = iterator.next(); if (subCol.filter(url) != null) { collections.add(subCol); } @@ -200,7 +200,7 @@ public List getSubCollections(final String url) { * * @return All collections CollectionManager knows about */ - public Collection getAll() { + public Collection getAll() { return collectionMap.values(); } @@ -219,10 +219,10 @@ public void save() throws IOException { final Document doc = new DocumentImpl(); final Element collections = doc .createElement(Subcollection.TAG_COLLECTIONS); - final Iterator iterator = collectionMap.values().iterator(); + final Iterator iterator = collectionMap.values().iterator(); while (iterator.hasNext()) { - final Subcollection subCol = (Subcollection) iterator.next(); + final Subcollection subCol = iterator.next(); final Element collection = doc .createElement(Subcollection.TAG_COLLECTION); collections.appendChild(collection); diff --git a/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java b/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java index 0fd094ece3..1beab362be 100644 --- a/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java +++ b/src/test/org/apache/nutch/crawl/CrawlDbUpdateUtil.java @@ -347,7 +347,6 @@ public Path getWorkingDirectory() throws IOException { * list of input CrawlDatums * @return list of resulting CrawlDatum(s) in CrawlDb */ - @SuppressWarnings("unchecked") public List update(List values) { if (values == null || values.size() == 0) { return new ArrayList(0); @@ -355,8 +354,8 @@ public List update(List values) { Collections.shuffle(values); // sorting of values should have no influence DummyContext context = new DummyContext(); try { - Iterable iterable_values = (Iterable)values; - reducer.reduce(dummyURL, iterable_values, (Reducer.Context) context); + Iterable iterable_values = values; + reducer.reduce(dummyURL, iterable_values, context); } catch (IOException e) { LOG.error(StringUtils.stringifyException(e)); } catch (InterruptedException e) { diff --git a/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java b/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java index 737aad94a6..1c0d0a7f96 100644 --- a/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java +++ b/src/test/org/apache/nutch/crawl/TestCrawlDbStates.java @@ -101,9 +101,9 @@ public void testCrawlDbStateTransitionMatrix() { LOG.info("Test CrawlDatum state transitions"); Reducer.Context context = CrawlDBTestUtil.createContext(); Configuration conf = context.getConfiguration(); - CrawlDbUpdateUtil updateDb = null; + CrawlDbUpdateUtil updateDb = null; try { - updateDb = new CrawlDbUpdateUtil( + updateDb = new CrawlDbUpdateUtil<>( new CrawlDbReducer(), context); } catch (IOException e) { e.printStackTrace();