From ff80700aff853b8601720837e35afb28b2f08c5a Mon Sep 17 00:00:00 2001 From: reger Date: Mon, 1 Dec 2014 00:21:30 +0100 Subject: [PATCH] replace depreciated Solr DateField.formatExternal with recommended TrieDateField.formatExternal --- .../solr/responsewriter/EnhancedXMLResponseWriter.java | 5 ++--- .../federate/solr/responsewriter/HTMLResponseWriter.java | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java index ea8912004..9ba607584 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/EnhancedXMLResponseWriter.java @@ -231,7 +231,6 @@ public class EnhancedXMLResponseWriter implements QueryResponseWriter { writer.write(lb); } - @SuppressWarnings("deprecation") private static void writeField(final Writer writer, final String typeName, final String name, final String value) throws IOException { if (typeName.equals(SolrType.text_general.printName()) || typeName.equals(SolrType.string.printName()) || @@ -244,7 +243,7 @@ public class EnhancedXMLResponseWriter implements QueryResponseWriter { } else if (typeName.equals(SolrType.num_long.printName())) { writeTag(writer, "long", name, value, true); } else if (typeName.equals(SolrType.date.printName())) { - writeTag(writer, "date", name, org.apache.solr.schema.DateField.formatExternal(new Date(Long.parseLong(value))), true); // this is declared deprecated in solr 4.2.1 but is still used as done here + writeTag(writer, "date", name, org.apache.solr.schema.TrieDateField.formatExternal(new Date(Long.parseLong(value))), true); } else if (typeName.equals(SolrType.num_float.printName())) { writeTag(writer, "float", name, value, true); } else if (typeName.equals(SolrType.num_double.printName())) { @@ -262,7 +261,7 @@ public class EnhancedXMLResponseWriter implements QueryResponseWriter { } else if (value instanceof Long) { writeTag(writer, "long", name, ((Long) value).toString(), true); } else if (value instanceof Date) { - writeTag(writer, "date", name, ((Date) value).toString(), true); // this is declared deprecated in solr 4.2.1 but is still used as done here + writeTag(writer, "date", name, org.apache.solr.schema.TrieDateField.formatExternal((Date) value), true); } else if (value instanceof Float) { writeTag(writer, "float", name, ((Float) value).toString(), true); } else if (value instanceof Double) { diff --git a/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java b/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java index c090f6b01..b0713653c 100644 --- a/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java +++ b/source/net/yacy/cora/federate/solr/responsewriter/HTMLResponseWriter.java @@ -212,13 +212,12 @@ public class HTMLResponseWriter implements QueryResponseWriter { return kv; } - @SuppressWarnings("deprecation") private static String field2string(final FieldType type, final String value) { String typeName = type.getTypeName(); if (typeName.equals(SolrType.bool.printName())) { return "F".equals(value) ? "false" : "true"; } else if (typeName.equals(SolrType.date.printName())) { - return org.apache.solr.schema.DateField.formatExternal(new Date(Long.parseLong(value))); // this is declared deprecated in solr 4.2.1 but is still used as done here + return org.apache.solr.schema.TrieDateField.formatExternal(new Date(Long.parseLong(value))); } return value; }