You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/02/25 14:26:56 UTC
[3/4] git commit: [OLINGO-179] fix2
[OLINGO-179] fix2
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/8a737a3e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/8a737a3e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/8a737a3e
Branch: refs/heads/master
Commit: 8a737a3e03b4a397f091bd83c56cca38ea2e2d2c
Parents: 2cd5341
Author: Stephan Klevenz <sk...@apache.org>
Authored: Tue Feb 25 14:20:19 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Tue Feb 25 14:20:19 2014 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java | 2 +-
.../src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java | 2 +-
.../java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java | 2 ++
3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8a737a3e/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
index c12becc..cac1f19 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
@@ -40,7 +40,7 @@ public class EdmDouble extends AbstractSimpleType {
private static final Pattern PATTERN = Pattern.compile(
- "(?:\\+|-)?\\p{Digit}{1,17}(?:\\.\\p{Digit}{1,17})?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,3})?(D|d)?");
+ "(?:\\+|-)?\\p{Digit}{1,16}(?:\\.\\p{Digit}{1,16})?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,3})?(D|d)?");
private static final EdmDouble instance = new EdmDouble();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8a737a3e/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
index cb8cc5f..a17d061 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
@@ -39,7 +39,7 @@ public class EdmSingle extends AbstractSimpleType {
private static final int MAX_SCALE = 38;
private static final Pattern PATTERN = Pattern.compile(
- "(?:\\+|-)?\\p{Digit}{1,7}(?:\\.\\p{Digit}{1,7})?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,2})?(F|f)?");
+ "(?:\\+|-)?\\p{Digit}{1,8}(?:\\.\\p{Digit}{1,8})?(?:(?:E|e)(?:\\+|-)?\\p{Digit}{1,2})?(F|f)?");
private static final EdmSingle instance = new EdmSingle();
public static EdmSingle getInstance() {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/8a737a3e/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
index 2c86a62..1af3e2e 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
@@ -1368,6 +1368,7 @@ public class EdmSimpleTypeTest extends BaseTest {
Long.class));
assertEquals(Double.valueOf(1234567890), instance.valueOfString("1234567890E+00", EdmLiteralKind.DEFAULT, null,
Double.class));
+
assertEquals(Double.valueOf(16.0), instance.valueOfString("1.6000000000000000E+01", EdmLiteralKind.DEFAULT, null,
Double.class));
assertEquals(Double.valueOf(Double.NaN), instance.valueOfString("NaN", EdmLiteralKind.DEFAULT, null, Double.class));
@@ -1531,6 +1532,7 @@ public class EdmSimpleTypeTest extends BaseTest {
final EdmSimpleType instance = EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance();
assertEquals(Float.valueOf(1.42F), instance.valueOfString("1.42", EdmLiteralKind.DEFAULT, null, Float.class));
+ assertEquals(Float.valueOf(1.000000001F), instance.valueOfString("1.00000001", EdmLiteralKind.DEFAULT, null, Float.class));
assertEquals(Double.valueOf(-42.42), instance.valueOfString("-42.42", EdmLiteralKind.JSON, null, Double.class));
assertEquals(Float.valueOf(42.0F), instance.valueOfString("42F", EdmLiteralKind.URI, null, Float.class));
assertEquals(Float.valueOf(2.2E38F), instance.valueOfString("22E37f", EdmLiteralKind.URI, null, Float.class));