You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ar...@apache.org on 2020/02/21 03:49:44 UTC

[olingo-odata4] branch master updated: EdmDouble relaxed

This is an automated email from the ASF dual-hosted git repository.

archanarai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/olingo-odata4.git


The following commit(s) were added to refs/heads/master by this push:
     new 2b437ad  EdmDouble relaxed
     new cd7e028  Merge branch 'master' of https://gitbox.apache.org/repos/asf/olingo-odata4
2b437ad is described below

commit 2b437addace10e3649577109891cf061aa9c8d5f
Author: Archana Rai <ar...@sap.com>
AuthorDate: Fri Feb 21 09:17:35 2020 +0530

    EdmDouble relaxed
---
 .../org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java     | 2 +-
 .../org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java
index cd6518b..3d21b6b 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java
@@ -36,7 +36,7 @@ public final class EdmDouble extends SingletonPrimitiveType {
   protected static final String NaN = "NaN";
 
   private static final Pattern PATTERN = Pattern.compile(
-      "(?:\\+|-)?\\p{Digit}{1,17}(?:\\.\\p{Digit}{1,17})?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,3})?");
+      "(?:\\+|-)?\\p{Digit}+(?:\\.\\p{Digit}+)?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,3})?");
 
   private static final EdmDouble INSTANCE = new EdmDouble();
 
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java
index 5b7545d..2224265 100644
--- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java
+++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java
@@ -91,6 +91,8 @@ public class EdmDoubleTest extends PrimitiveTypeBaseTest {
     assertEquals(Integer.valueOf(42), instance.valueOfString("4.2E1", null, null, null, null, null, Integer.class));
     assertEquals(Long.valueOf(1234567890), instance.valueOfString("1234567890E-00", null, null, null, null, null,
         Long.class));
+    assertEquals(Double.valueOf(-0.043099999999995475), instance.valueOfString("-0.043099999999995475", null, null, 
+        null, null, null, Double.class));
 
     assertEquals(Double.valueOf(Double.NaN), instance.valueOfString("NaN", null, null, null, null, null,
         Double.class));