boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed "Unchecked conversion" compilation warnings.

Browse Source
pull/122/head
luccioman 8 years ago
parent 2b03e40134
commit 527d494c1a
9 changed files with 68 additions and 63 deletions
Show Stats Download Patch File Download Diff File

2
source/net/yacy/cora/federate/solr/responsewriter/FlatJSONResponseWriter.java
Unescape View File

@ -31,8 +31,6 @@ import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexableField;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.common.util.XML;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.ResultContext;

12
source/net/yacy/cora/util/JSONArray.java
Unescape View File

@ -150,10 +150,10 @@ public class JSONArray {
* @param collection
* A Collection.
*/
public JSONArray(Collection<Object> collection) {
public JSONArray(Collection<?> collection) {
this.myArrayList = new ArrayList<Object>();
if (collection != null) {
Iterator<Object> iter = collection.iterator();
Iterator<?> iter = collection.iterator();
while (iter.hasNext()) {
this.myArrayList.add(JSONObject.wrap(iter.next()));
}
@ -593,7 +593,7 @@ public class JSONArray {
* A Collection value.
* @return this.
*/
public JSONArray put(Collection<Object> value) {
public JSONArray put(Collection<?> value) {
this.put(new JSONArray(value));
return this;
}
@ -646,7 +646,7 @@ public class JSONArray {
* A Map value.
* @return this.
*/
public JSONArray put(Map<String, Object> value) {
public JSONArray put(Map<String, ?> value) {
this.put(new JSONObject(value));
return this;
}
@ -695,7 +695,7 @@ public class JSONArray {
* @throws JSONException
* If the index is negative or if the value is not finite.
*/
public JSONArray put(int index, Collection<Object> value) throws JSONException {
public JSONArray put(int index, Collection<?> value) throws JSONException {
this.put(index, new JSONArray(value));
return this;
}
@ -767,7 +767,7 @@ public class JSONArray {
* If the index is negative or if the the value is an invalid
* number.
*/
public JSONArray put(int index, Map<String, Object> value) throws JSONException {
public JSONArray put(int index, Map<String, ?> value) throws JSONException {
this.put(index, new JSONObject(value));
return this;
}

29
source/net/yacy/cora/util/JSONObject.java
Unescape View File

@ -249,15 +249,15 @@ public class JSONObject {
* the JSONObject.
* @throws JSONException
*/
public JSONObject(Map<String, Object> map) {
public<KEY_TYPE, VALUE_TYPE> JSONObject(Map<KEY_TYPE, VALUE_TYPE> map) {
this.map = new LinkedHashMap<String, Object>();
if (map != null) {
Iterator<Entry<String, Object>> i = map.entrySet().iterator();
Iterator<Entry<KEY_TYPE, VALUE_TYPE>> i = map.entrySet().iterator();
while (i.hasNext()) {
Entry<String, Object> entry = i.next();
Entry<KEY_TYPE, VALUE_TYPE> entry = i.next();
Object value = entry.getValue();
if (value != null) {
this.map.put(entry.getKey(), wrap(value));
if (value != null && entry.getKey() instanceof String) {
this.map.put((String)entry.getKey(), wrap(value));
}
}
}
@ -1063,7 +1063,7 @@ public class JSONObject {
* @return this.
* @throws JSONException
*/
public JSONObject put(String key, Collection<Object> value) throws JSONException {
public JSONObject put(String key, Collection<?> value) throws JSONException {
this.put(key, new JSONArray(value));
return this;
}
@ -1127,7 +1127,7 @@ public class JSONObject {
* @return this.
* @throws JSONException
*/
public JSONObject put(String key, Map<String, Object> value) throws JSONException {
public JSONObject put(String key, Map<String, ?> value) throws JSONException {
this.put(key, new JSONObject(value));
return this;
}
@ -1498,7 +1498,6 @@ public class JSONObject {
* @throws JSONException
* If the value is or contains an invalid number.
*/
@SuppressWarnings("unchecked")
public static String valueToString(Object value) throws JSONException {
if (value == null || value.equals(null)) {
return "null";
@ -1523,10 +1522,10 @@ public class JSONObject {
return value.toString();
}
if (value instanceof Map) {
return new JSONObject((Map<String, Object>)value).toString();
return new JSONObject((Map<?, ?>)value).toString();
}
if (value instanceof Collection) {
return new JSONArray((Collection<Object>) value).toString();
return new JSONArray((Collection<?>) value).toString();
}
if (value.getClass().isArray()) {
return new JSONArray(value).toString();
@ -1546,7 +1545,6 @@ public class JSONObject {
* The object to wrap
* @return The wrapped value
*/
@SuppressWarnings("unchecked")
public static Object wrap(Object object) {
try {
if (object == null) {
@ -1563,13 +1561,13 @@ public class JSONObject {
}
if (object instanceof Collection) {
return new JSONArray((Collection<Object>) object);
return new JSONArray((Collection<?>) object);
}
if (object.getClass().isArray()) {
return new JSONArray(object);
}
if (object instanceof Map) {
return new JSONObject((Map<String, Object>) object);
return new JSONObject((Map<?, ?>) object);
}
Package objectPackage = object.getClass().getPackage();
String objectPackageName = objectPackage != null ? objectPackage
@ -1598,7 +1596,6 @@ public class JSONObject {
return this.write(writer, 0, 0);
}
@SuppressWarnings("unchecked")
static final Writer writeValue(Writer writer, Object value,
int indentFactor, int indent) throws JSONException, IOException {
if (value == null || value.equals(null)) {
@ -1608,9 +1605,9 @@ public class JSONObject {
} else if (value instanceof JSONArray) {
((JSONArray) value).write(writer, indentFactor, indent);
} else if (value instanceof Map) {
new JSONObject((Map<String, Object>) value).write(writer, indentFactor, indent);
new JSONObject((Map<?, ?>) value).write(writer, indentFactor, indent);
} else if (value instanceof Collection) {
new JSONArray((Collection<Object>) value).write(writer, indentFactor,
new JSONArray((Collection<?>) value).write(writer, indentFactor,
indent);
} else if (value.getClass().isArray()) {
new JSONArray(value).write(writer, indentFactor, indent);

16
source/net/yacy/document/parser/pdfParser.java
Unescape View File

@ -146,11 +146,10 @@ public class pdfParser extends AbstractParser implements Parser {
docKeywords = docKeywordStr.split(" |,");
}
Collection<AnchorURL>[] pdflinks = null;
Document[] result = null;
try {
// get the links
pdflinks = extractPdfLinks(pdfDoc);
final List<Collection<AnchorURL>> pdflinks = extractPdfLinks(pdfDoc);
// get the fulltext (either per document or for each page)
final PDFTextStripper stripper = new PDFTextStripper(/*StandardCharsets.UTF_8.name()*/);
@ -170,8 +169,8 @@ public class pdfParser extends AbstractParser implements Parser {
}
// create individual documents for each page
assert pages.length == pdflinks.length : "pages.length = " + pages.length + ", pdflinks.length = " + pdflinks.length;
result = new Document[Math.min(pages.length, pdflinks.length)];
assert pages.length == pdflinks.size() : "pages.length = " + pages.length + ", pdflinks.length = " + pdflinks.size();
result = new Document[Math.min(pages.length, pdflinks.size())];
String loc = location.toNormalform(true);
for (int page = 0; page < result.length; page++) {
result[page] = new Document(
@ -188,7 +187,7 @@ public class pdfParser extends AbstractParser implements Parser {
null,
0.0d, 0.0d,
pages == null || page > pages.length ? new byte[0] : UTF8.getBytes(pages[page]),
pdflinks == null || page >= pdflinks.length ? null : pdflinks[page],
pdflinks == null || page >= pdflinks.size() ? null : pdflinks.get(page),
null,
null,
false,
@ -272,9 +271,8 @@ public class pdfParser extends AbstractParser implements Parser {
* @param pdf the document to parse
* @return all detected links
*/
private Collection<AnchorURL>[] extractPdfLinks(final PDDocument pdf) {
Collection<AnchorURL>[] linkCollections = (Collection<AnchorURL>[]) new Collection<?>[pdf.getNumberOfPages()];
int pagecount = 0;
private List<Collection<AnchorURL>> extractPdfLinks(final PDDocument pdf) {
List<Collection<AnchorURL>> linkCollections = new ArrayList<>(pdf.getNumberOfPages());
for (PDPage page : pdf.getPages()) {
final Collection<AnchorURL> pdflinks = new ArrayList<AnchorURL>();
try {
@ -293,7 +291,7 @@ public class pdfParser extends AbstractParser implements Parser {
}
}
} catch (IOException ex) {}
linkCollections[pagecount++] = pdflinks;
linkCollections.add(pdflinks);
}
return linkCollections;
}

15
source/net/yacy/search/navigator/FileTypeNavigator.java
Unescape View File

@ -66,12 +66,15 @@ public class FileTypeNavigator extends StringNavigator implements Navigator {
if (field != null) {
Object val = doc.getFieldValue(field.getSolrFieldName());
if (val instanceof Collection) {
Collection<String> ll = (Collection) val;
for (String s : ll) {
// remove all filetypes that we don't know
if (Classification.isAnyKnownExtension(s)) {
this.inc(s);
}
Collection<?> ll = (Collection<?>) val;
for (Object obj : ll) {
if(obj instanceof String) {
final String s = (String)obj;
// remove all filetypes that we don't know
if (Classification.isAnyKnownExtension(s)) {
this.inc(s);
}
}
}
} else {
if (val != null) {

15
source/net/yacy/search/navigator/HostNavigator.java
Unescape View File

@ -64,12 +64,15 @@ public class HostNavigator extends StringNavigator implements Navigator {
Object val = doc.getFieldValue(field.getSolrFieldName());
if (val != null) {
if (val instanceof Collection) {
Collection<String> ll = (Collection) val;
for (String s : ll) {
if (s.startsWith("www.")) {
s = s.substring(4);
}
this.inc(s);
Collection<?> ll = (Collection<?>) val;
for (Object obj : ll) {
if(obj instanceof String) {
String s = (String)obj;
if (s.startsWith("www.")) {
s = s.substring(4);
}
this.inc(s);
}
}
} else {
String host = (String) val;

15
source/net/yacy/search/navigator/StringNavigator.java
Unescape View File

@ -114,7 +114,7 @@ public class StringNavigator extends ConcurrentScoreMap<String> implements Navi
/**
* Increase the score for the key value contained in the defined field in
* the doc.
* @param doc Solrdocument with field for the key content
* @param doc URIMetadataNode with field for the key content
*/
@Override
public void incDoc(URIMetadataNode doc) {
@ -122,11 +122,14 @@ public class StringNavigator extends ConcurrentScoreMap<String> implements Navi
Object val = doc.getFieldValue(field.getSolrFieldName());
if (val != null) {
if (val instanceof Collection) {
Collection<String> ll = (Collection) val;
for (String s : ll) {
if (!s.isEmpty()) {
this.inc(s);
}
Collection<?> ll = (Collection<?>) val;
for (Object obj : ll) {
if(obj instanceof String) {
final String s = (String)obj;
if (!s.isEmpty()) {
this.inc(s);
}
}
}
} else {
this.inc((String) val);

25
source/net/yacy/search/navigator/TokenizedStringNavigator.java
Unescape View File

@ -50,17 +50,20 @@ public class TokenizedStringNavigator extends StringNavigator implements Naviga
Object val = doc.getFieldValue(field.getSolrFieldName());
if (val != null) {
if (val instanceof Collection) {
Collection<String> ll = (Collection) val;
for (String s : ll) {
if (!s.isEmpty()) {
StringTokenizer token = new StringTokenizer(s.toLowerCase()," ,;"); // StringTokenizer faster than regex pattern
while (token.hasMoreTokens()) {
String word = token.nextToken();
if (word.length() > 1 && !Switchboard.stopwords.contains(word)) {
this.inc(word);
}
}
}
Collection<?> ll = (Collection<?>) val;
for (Object obj : ll) {
if(obj instanceof String) {
final String s = (String)obj;
if (!s.isEmpty()) {
StringTokenizer token = new StringTokenizer(s.toLowerCase()," ,;"); // StringTokenizer faster than regex pattern
while (token.hasMoreTokens()) {
String word = token.nextToken();
if (word.length() > 1 && !Switchboard.stopwords.contains(word)) {
this.inc(word);
}
}
}
}
}
} else {
StringTokenizer token = new StringTokenizer((String) val, " ,;");

2
source/net/yacy/search/navigator/YearNavigator.java
Unescape View File

@ -100,7 +100,7 @@ public class YearNavigator extends StringNavigator implements Navigator {
if (val != null) {
Calendar cal = Calendar.getInstance();
if (val instanceof Collection) {
Collection<Object> ll = (Collection) val;
Collection<?> ll = (Collection<?>) val;
for (Object o : ll) {
if (o instanceof String) {
this.inc((String) o);

Write Preview
Loading…
Cancel
Save