You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jb...@apache.org on 2017/04/12 19:15:03 UTC

[08/12] lucene-solr:master: SOLR-10303: Error message formatting for TemporalEvaluator

SOLR-10303:  Error message formatting for TemporalEvaluator


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8642ed9f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8642ed9f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8642ed9f

Branch: refs/heads/master
Commit: 8642ed9f88e2c8667ff80835b2b3b632786884ab
Parents: 1c333c7
Author: Gethin James <ge...@alfresco.com>
Authored: Thu Apr 6 17:19:31 2017 +0200
Committer: Joel Bernstein <jb...@apache.org>
Committed: Wed Apr 12 15:04:51 2017 -0400

----------------------------------------------------------------------
 .../org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java  | 2 +-
 .../solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8642ed9f/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java
index 884653f..1694236 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/eval/TemporalEvaluator.java
@@ -83,7 +83,7 @@ public abstract class TemporalEvaluator extends ComplexEvaluator {
       }
     }
 
-    throw new IOException(String.format(Locale.ROOT, "Invalid parameter %s - The parameter must be a string formatted ISO_INSTANT or of type Instant,Date or LocalDateTime.", String.valueOf(tupleValue)));
+    throw new IOException(String.format(Locale.ROOT, "Invalid parameter %s - The parameter must be a string formatted ISO_INSTANT or of type Long,Instant,Date,LocalDateTime or TemporalAccessor.", String.valueOf(tupleValue)));
   }
 
   public abstract Object evaluateDate(TemporalAccessor aDate) throws IOException;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8642ed9f/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
index a6c590b..6f8c788 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/eval/TemporalEvaluatorsTest.java
@@ -132,7 +132,7 @@ public class TemporalEvaluatorsTest {
       Object result = evaluator.evaluate(new Tuple(values));
       assertTrue(false);
     } catch (IOException e) {
-      assertEquals("Invalid parameter 12 - The parameter must be a string formatted ISO_INSTANT or of type Instant,Date or LocalDateTime.", e.getMessage());
+      assertEquals("Invalid parameter 12 - The parameter must be a string formatted ISO_INSTANT or of type Long,Instant,Date,LocalDateTime or TemporalAccessor.", e.getMessage());
     }
 
     try {
@@ -150,7 +150,7 @@ public class TemporalEvaluatorsTest {
       Object result = evaluator.evaluate(new Tuple(values));
       assertTrue(false);
     } catch (IOException e) {
-      assertEquals("Invalid parameter  - The parameter must be a string formatted ISO_INSTANT or of type Instant,Date or LocalDateTime.", e.getMessage());
+      assertEquals("Invalid parameter  - The parameter must be a string formatted ISO_INSTANT or of type Long,Instant,Date,LocalDateTime or TemporalAccessor.", e.getMessage());
     }
 
     values.clear();