Author: lewismc
Date: Sat Jan 12 16:37:23 2013
New Revision: 1432471
URL: http://svn.apache.org/viewvc?rev=1432471&view=rev
Log:
NUTCH-1274 Fix [cast] javac warnings
Modified:
nutch/branches/2.x/CHANGES.txt
nutch/branches/2.x/src/java/org/apache/nutch/api/DbReader.java
nutch/branches/2.x/src/java/org/apache/nutch/crawl/WebTableReader.java
nutch/branches/2.x/src/java/org/apache/nutch/fetcher/FetcherReducer.java
nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrWriter.java
nutch/branches/2.x/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
nutch/branches/2.x/src/test/org/apache/nutch/parse/TestParserFactory.java
Modified: nutch/branches/2.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/CHANGES.txt?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
--- nutch/branches/2.x/CHANGES.txt (original)
+++ nutch/branches/2.x/CHANGES.txt Sat Jan 12 16:37:23 2013
@@ -2,6 +2,8 @@ Nutch Change Log
Release 2.2 - Current Development
+* NUTCH-1274 Fix [cast] javac warnings (Tejas Patil via lewismc)
+
* NUTCH-1516 Nutch 2.x pom.xml out of sync with ivy.xml
* NUTCH-1510 Upgrade to Hadoop 1.1.1 (markus)
Modified: nutch/branches/2.x/src/java/org/apache/nutch/api/DbReader.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/api/DbReader.java?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/api/DbReader.java (original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/api/DbReader.java Sat Jan 12
16:37:23 2013
@@ -74,7 +74,7 @@ public class DbReader {
// remove "url"
flds.remove("url");
if (flds.size() > 0) {
- qFields = (String[])flds.toArray(new String[flds.size()]);
+ qFields = flds.toArray(new String[flds.size()]);
} else {
qFields = null;
}
Modified: nutch/branches/2.x/src/java/org/apache/nutch/crawl/WebTableReader.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/crawl/WebTableReader.java?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/crawl/WebTableReader.java
(original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/crawl/WebTableReader.java Sat
Jan 12 16:37:23 2013
@@ -125,7 +125,7 @@ public class WebTableReader extends Nutc
throws IOException, InterruptedException {
val.set(0L);
Iterator<LongWritable> iter = values.iterator();
- String k = ((Text) key).toString();
+ String k = key.toString();
if (!k.equals("s")) {
while (iter.hasNext()) {
LongWritable cnt = iter.next();
@@ -166,7 +166,7 @@ public class WebTableReader extends Nutc
org.apache.hadoop.mapreduce.Reducer<Text, LongWritable, Text,
LongWritable>.Context context)
throws IOException, InterruptedException {
Iterator<LongWritable> iter = values.iterator();
- String k = ((Text) key).toString();
+ String k = key.toString();
if (k.equals("T")) {
// sum all values for this key
long sum = 0;
@@ -574,9 +574,9 @@ public class WebTableReader extends Nutc
String k = entry.getKey();
LongWritable val = entry.getValue();
if (k.equals("scn")) {
- results.put("min score", (float) (val.get() / 1000.0f));
+ results.put("min score", (val.get() / 1000.0f));
} else if (k.equals("scx")) {
- results.put("max score", (float) (val.get() / 1000.0f));
+ results.put("max score", (val.get() / 1000.0f));
} else if (k.equals("sct")) {
results.put("avg score",
(float) ((((double) val.get()) / totalCnt.get()) / 1000.0));
Modified:
nutch/branches/2.x/src/java/org/apache/nutch/fetcher/FetcherReducer.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/fetcher/FetcherReducer.java?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/fetcher/FetcherReducer.java
(original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/fetcher/FetcherReducer.java
Sat Jan 12 16:37:23 2013
@@ -761,7 +761,7 @@ extends GoraReducer<IntWritable, FetchEn
status.append(spinWaiting).append("/").append(activeThreads).append("
spinwaiting/active, ");
status.append(pages).append(" pages, ").append(errors).append(" errors, ");
status.append(Math.round((((float)pages.get())*10)/elapsed)/10.0).append("
");
- status.append(Math.round(((float)actualPages)*10)/10.0).append(" pages/s,
");
+ status.append(Math.round((actualPages*10)/10.0)).append(" pages/s, ");
status.append(Math.round((((float)bytes.get())*8)/1024)/elapsed).append("
");
status.append(Math.round(((float)actualBytes)*8)/1024).append(" kb/s, ");
status.append(totalSize).append(" URLs in ");
Modified:
nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
---
nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
(original)
+++
nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrMappingReader.java
Sat Jan 12 16:37:23 2013
@@ -122,21 +122,21 @@ public class SolrMappingReader {
public String hasCopy(String key) {
if (copyMap.containsKey(key)) {
- key = (String) copyMap.get(key);
+ key = copyMap.get(key);
}
return key;
}
public String mapKey(String key) throws IOException {
if(keyMap.containsKey(key)) {
- key = (String) keyMap.get(key);
+ key = keyMap.get(key);
}
return key;
}
public String mapCopyKey(String key) throws IOException {
if(copyMap.containsKey(key)) {
- key = (String) copyMap.get(key);
+ key = copyMap.get(key);
}
return key;
}
Modified:
nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrWriter.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrWriter.java?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrWriter.java
(original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/indexer/solr/SolrWriter.java
Sat Jan 12 16:37:23 2013
@@ -61,7 +61,7 @@ public class SolrWriter implements Nutch
Object val2 = val;
if (e.getKey().equals("content") || e.getKey().equals("title")) {
- val2 = stripNonCharCodepoints((String)val);
+ val2 = stripNonCharCodepoints(val);
}
inputDoc.addField(solrMapping.mapKey(e.getKey()), val2);
Modified:
nutch/branches/2.x/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
--- nutch/branches/2.x/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
(original)
+++ nutch/branches/2.x/src/java/org/apache/nutch/tools/arc/ArcRecordReader.java
Sat Jan 12 16:37:23 2013
@@ -122,14 +122,14 @@ public class ArcRecordReader
* Creates a new instance of the <code>Text</code> object for the key.
*/
public Text createKey() {
- return (Text)ReflectionUtils.newInstance(Text.class, conf);
+ return ReflectionUtils.newInstance(Text.class, conf);
}
/**
* Creates a new instance of the <code>BytesWritable</code> object for the
key
*/
public BytesWritable createValue() {
- return (BytesWritable)ReflectionUtils.newInstance(BytesWritable.class,
conf);
+ return ReflectionUtils.newInstance(BytesWritable.class, conf);
}
/**
@@ -264,9 +264,9 @@ public class ArcRecordReader
System.arraycopy(content, eol + 1, raw, 0, raw.length);
// populate key and values with the header and raw content.
- Text keyText = (Text)key;
+ Text keyText = key;
keyText.set(header);
- BytesWritable valueBytes = (BytesWritable)value;
+ BytesWritable valueBytes = value;
valueBytes.set(raw, 0, raw.length);
// TODO: It would be best to start at the end of the gzip read but
Modified:
nutch/branches/2.x/src/test/org/apache/nutch/parse/TestParserFactory.java
URL:
http://svn.apache.org/viewvc/nutch/branches/2.x/src/test/org/apache/nutch/parse/TestParserFactory.java?rev=1432471&r1=1432470&r2=1432471&view=diff
==============================================================================
--- nutch/branches/2.x/src/test/org/apache/nutch/parse/TestParserFactory.java
(original)
+++ nutch/branches/2.x/src/test/org/apache/nutch/parse/TestParserFactory.java
Sat Jan 12 16:37:23 2013
@@ -49,11 +49,11 @@ public class TestParserFactory extends T
/** Unit test for <code>getExtensions(String)</code> method. */
public void testGetExtensions() throws Exception {
- Extension ext = (Extension)parserFactory.getExtensions("text/html").get(0);
+ Extension ext = parserFactory.getExtensions("text/html").get(0);
assertEquals("parse-tika", ext.getDescriptor().getPluginId());
- ext = (Extension) parserFactory.getExtensions("text/html;
charset=ISO-8859-1").get(0);
+ ext = parserFactory.getExtensions("text/html; charset=ISO-8859-1").get(0);
assertEquals("parse-tika", ext.getDescriptor().getPluginId());
- ext = (Extension)parserFactory.getExtensions("foo/bar").get(0);
+ ext = parserFactory.getExtensions("foo/bar").get(0);
assertEquals("parse-tika", ext.getDescriptor().getPluginId());
}
