[OLINGO-804] removed primitive type Uint7 Signed-off-by: Christian Amend <[email protected]>
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/85bebce0 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/85bebce0 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/85bebce0 Branch: refs/heads/olingo786 Commit: 85bebce0090dc08bbb1cf4ce1c052dd4d05ba827 Parents: 34ea4d0 Author: Klaus Straubinger <[email protected]> Authored: Fri Oct 16 15:45:17 2015 +0200 Committer: Christian Amend <[email protected]> Committed: Wed Oct 21 11:14:34 2015 +0200 ---------------------------------------------------------------------- .../commons/api/edm/EdmPrimitiveType.java | 2 - .../commons/api/edm/EdmPrimitiveTypeKind.java | 21 ++-- .../commons/core/edm/primitivetype/EdmByte.java | 7 -- .../core/edm/primitivetype/EdmDecimal.java | 3 +- .../core/edm/primitivetype/EdmDouble.java | 3 +- .../core/edm/primitivetype/EdmInt16.java | 3 +- .../core/edm/primitivetype/EdmInt32.java | 3 +- .../core/edm/primitivetype/EdmInt64.java | 3 +- .../core/edm/primitivetype/EdmSByte.java | 7 -- .../core/edm/primitivetype/EdmSingle.java | 3 +- .../commons/core/edm/primitivetype/Uint7.java | 66 ------------ .../primitivetype/CommonPrimitiveTypeTest.java | 107 +++++++++---------- .../core/edm/primitivetype/EdmByteTest.java | 6 -- .../core/edm/primitivetype/EdmDecimalTest.java | 1 - .../core/edm/primitivetype/EdmDoubleTest.java | 1 - .../core/edm/primitivetype/EdmInt16Test.java | 1 - .../core/edm/primitivetype/EdmInt32Test.java | 1 - .../core/edm/primitivetype/EdmInt64Test.java | 1 - .../core/edm/primitivetype/EdmSByteTest.java | 6 -- .../core/edm/primitivetype/EdmSingleTest.java | 1 - .../core/edm/primitivetype/UInt7Test.java | 35 ------ 21 files changed, 69 insertions(+), 212 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java index 52a74ba..2f14b3f 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java @@ -70,8 +70,6 @@ public interface EdmPrimitiveType extends EdmType { String EDM_NAMESPACE = "Edm"; - String SYSTEM_NAMESPACE = "System"; - /** * Checks type compatibility. * http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java ---------------------------------------------------------------------- diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java index dcba9ee..ecac055 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java @@ -76,21 +76,22 @@ public enum EdmPrimitiveTypeKind { } /** - * Gets <tt>EdmPrimitiveTypeKind</tt> from a full-qualified type name, for the given OData protocol version. - * - * @param fqn full-qualified type name. - * @return <tt>EdmPrimitiveTypeKind</tt> object. + * Gets the {@link EdmPrimitiveTypeKind} from a full-qualified type name. + * @param fqn full-qualified type name + * @return {@link EdmPrimitiveTypeKind} object */ public static EdmPrimitiveTypeKind valueOfFQN(final FullQualifiedName fqn) { - return valueOfFQN(fqn.toString()); + if (EdmPrimitiveType.EDM_NAMESPACE.equals(fqn.getNamespace())) { + return valueOf(fqn.getName()); + } else { + throw new IllegalArgumentException(fqn + " does not look like an EDM primitive type."); + } } /** - * Gets <tt>EdmPrimitiveTypeKind</tt> from a full type expression (as <tt>Edm.Int32</tt>), for the given OData - * protocol version. - * - * @param fqn string value type. - * @return <tt>EdmPrimitiveTypeKind</tt> object. + * Gets the {@link EdmPrimitiveTypeKind} from a full type expression (like <code>Edm.Int32</code>). + * @param fqn String containing a full-qualified type name + * @return {@link EdmPrimitiveTypeKind} object */ public static EdmPrimitiveTypeKind valueOfFQN(final String fqn) { if (!fqn.startsWith(EdmPrimitiveType.EDM_NAMESPACE + ".")) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java index bd81f5c..6e8e490 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java @@ -20,7 +20,6 @@ package org.apache.olingo.commons.core.edm.primitivetype; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; /** @@ -35,12 +34,6 @@ public final class EdmByte extends SingletonPrimitiveType { } @Override - public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmByte; - } - - @Override public Class<?> getDefaultType() { return Short.class; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java index a3aa348..1228c7a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java @@ -41,8 +41,7 @@ public final class EdmDecimal extends SingletonPrimitiveType { @Override public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmByte + return primitiveType instanceof EdmByte || primitiveType instanceof EdmSByte || primitiveType instanceof EdmInt16 || primitiveType instanceof EdmInt32 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java ---------------------------------------------------------------------- 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 e216238..cd6518b 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 @@ -46,8 +46,7 @@ public final class EdmDouble extends SingletonPrimitiveType { @Override public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmByte + return primitiveType instanceof EdmByte || primitiveType instanceof EdmSByte || primitiveType instanceof EdmInt16 || primitiveType instanceof EdmInt32 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java index 041c579..b0c1d76 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java @@ -36,8 +36,7 @@ public final class EdmInt16 extends SingletonPrimitiveType { @Override public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmByte + return primitiveType instanceof EdmByte || primitiveType instanceof EdmSByte || primitiveType instanceof EdmInt16; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java index 7f31543..5ce0762 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java @@ -36,8 +36,7 @@ public final class EdmInt32 extends SingletonPrimitiveType { @Override public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmByte + return primitiveType instanceof EdmByte || primitiveType instanceof EdmSByte || primitiveType instanceof EdmInt16 || primitiveType instanceof EdmInt32; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java index 1f10be7..cd2c692 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java @@ -36,8 +36,7 @@ public final class EdmInt64 extends SingletonPrimitiveType { @Override public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmByte + return primitiveType instanceof EdmByte || primitiveType instanceof EdmSByte || primitiveType instanceof EdmInt16 || primitiveType instanceof EdmInt32 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java index 564458e..26e874c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java @@ -20,7 +20,6 @@ package org.apache.olingo.commons.core.edm.primitivetype; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; /** @@ -35,12 +34,6 @@ public final class EdmSByte extends SingletonPrimitiveType { } @Override - public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmSByte; - } - - @Override public Class<?> getDefaultType() { return Byte.class; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java index b629277..1fd98f0 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java @@ -40,8 +40,7 @@ public final class EdmSingle extends SingletonPrimitiveType { @Override public boolean isCompatible(final EdmPrimitiveType primitiveType) { - return primitiveType instanceof Uint7 - || primitiveType instanceof EdmByte + return primitiveType instanceof EdmByte || primitiveType instanceof EdmSByte || primitiveType instanceof EdmInt16 || primitiveType instanceof EdmInt32 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/Uint7.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/Uint7.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/Uint7.java deleted file mode 100644 index d521b46..0000000 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/Uint7.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.core.edm.primitivetype; - -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - -/** - * Implementation of the internal primitive type "unsigned 7-bit integer". - */ -public final class Uint7 extends SingletonPrimitiveType { - - private static final Uint7 INSTANCE = new Uint7(); - - public static Uint7 getInstance() { - return INSTANCE; - } - - @Override - public String getNamespace() { - return SYSTEM_NAMESPACE; - } - - @Override - public String getName() { - return getClass().getSimpleName(); - } - - @Override - public Class<?> getDefaultType() { - return Byte.class; - } - - @Override - protected <T> T internalValueOfString(final String value, - final Boolean isNullable, final Integer maxLength, final Integer precision, - final Integer scale, final Boolean isUnicode, final Class<T> returnType) throws EdmPrimitiveTypeException { - - return EdmSByte.getInstance().internalValueOfString( - value, isNullable, maxLength, precision, scale, isUnicode, returnType); - } - - @Override - protected <T> String internalValueToString(final T value, - final Boolean isNullable, final Integer maxLength, final Integer precision, - final Integer scale, final Boolean isUnicode) throws EdmPrimitiveTypeException { - - return EdmSByte.getInstance().internalValueToString( - value, isNullable, maxLength, precision, scale, isUnicode); - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java index 79464b1..209aa37 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java @@ -30,84 +30,50 @@ import java.util.UUID; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.commons.api.edm.geo.Geospatial; +import org.apache.olingo.commons.api.edm.geo.GeospatialCollection; +import org.apache.olingo.commons.api.edm.geo.LineString; +import org.apache.olingo.commons.api.edm.geo.MultiLineString; +import org.apache.olingo.commons.api.edm.geo.MultiPoint; +import org.apache.olingo.commons.api.edm.geo.MultiPolygon; +import org.apache.olingo.commons.api.edm.geo.Point; +import org.apache.olingo.commons.api.edm.geo.Polygon; import org.junit.Test; public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { @Test public void nameSpace() throws Exception { - assertEquals(EdmPrimitiveType.SYSTEM_NAMESPACE, Uint7.getInstance().getNamespace()); - - assertEquals(EdmPrimitiveType.EDM_NAMESPACE, EdmInt32.getInstance().getNamespace()); - for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - final EdmType instance = EdmPrimitiveTypeFactory.getInstance(kind); - assertEquals(EdmPrimitiveType.EDM_NAMESPACE, instance.getNamespace()); + for (final EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { + assertEquals(EdmPrimitiveType.EDM_NAMESPACE, EdmPrimitiveTypeFactory.getInstance(kind).getNamespace()); } } @Test public void names() throws Exception { - assertEquals("Uint7", Uint7.getInstance().getName()); - - assertEquals("Binary", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Binary).getName()); - assertEquals("Boolean", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean).getName()); - assertEquals("Byte", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte).getName()); - assertEquals("Date", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Date).getName()); - assertEquals("DateTimeOffset", - EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.DateTimeOffset).getName()); - assertEquals("Decimal", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Decimal).getName()); - assertEquals("Double", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Double).getName()); - assertEquals("Duration", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Duration).getName()); - assertEquals("Guid", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Guid).getName()); - assertEquals("Int16", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16).getName()); - assertEquals("Int32", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int32).getName()); - assertEquals("Int64", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int64).getName()); - assertEquals("SByte", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte).getName()); - assertEquals("Single", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Single).getName()); - assertEquals("String", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.String).getName()); - assertEquals("TimeOfDay", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.TimeOfDay).getName()); + for (final EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { + assertEquals(kind.name(), EdmPrimitiveTypeFactory.getInstance(kind).getName()); + } } @Test public void kind() throws Exception { - for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { + for (final EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { assertEquals(EdmTypeKind.PRIMITIVE, EdmPrimitiveTypeFactory.getInstance(kind).getKind()); } } @Test public void toStringAll() throws Exception { - assertEquals("System.Uint7", Uint7.getInstance().toString()); - - assertEquals("Edm.Binary", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Binary).toString()); - assertEquals("Edm.Boolean", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean).toString()); - assertEquals("Edm.Byte", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte).toString()); - assertEquals("Edm.Date", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Date).toString()); - assertEquals("Edm.DateTimeOffset", - EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.DateTimeOffset).toString()); - assertEquals("Edm.Decimal", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Decimal).toString()); - assertEquals("Edm.Double", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Double).toString()); - assertEquals("Edm.Duration", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Duration).toString()); - assertEquals("Edm.Guid", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Guid).toString()); - assertEquals("Edm.Int16", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16).toString()); - assertEquals("Edm.Int32", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int32).toString()); - assertEquals("Edm.Int64", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int64).toString()); - assertEquals("Edm.SByte", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte).toString()); - assertEquals("Edm.Single", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Single).toString()); - assertEquals("Edm.String", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.String).toString()); - assertEquals("Edm.TimeOfDay", EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.TimeOfDay).toString()); - - for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(kind); - assertEquals(instance.toString(), kind.getFullQualifiedName().toString()); + for (final EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { + assertEquals(kind.getFullQualifiedName().toString(), EdmPrimitiveTypeFactory.getInstance(kind).toString()); } } @Test public void compatibility() { - for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { + for (final EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(kind); assertTrue(instance.isCompatible(instance)); assertFalse(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance( @@ -117,8 +83,6 @@ public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { @Test public void defaultType() throws Exception { - assertEquals(Byte.class, Uint7.getInstance().getDefaultType()); - assertEquals(byte[].class, EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Binary).getDefaultType()); assertEquals(Boolean.class, EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean).getDefaultType()); @@ -140,11 +104,44 @@ public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { assertEquals(String.class, EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.String).getDefaultType()); assertEquals(Calendar.class, EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.TimeOfDay).getDefaultType()); + + assertEquals(Geospatial.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Geography).getDefaultType()); + assertEquals(Point.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeographyPoint).getDefaultType()); + assertEquals(LineString.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeographyLineString).getDefaultType()); + assertEquals(Polygon.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeographyPolygon).getDefaultType()); + assertEquals(MultiPoint.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeographyMultiPoint).getDefaultType()); + assertEquals(MultiLineString.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeographyMultiLineString).getDefaultType()); + assertEquals(MultiPolygon.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeographyMultiPolygon).getDefaultType()); + assertEquals(GeospatialCollection.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeographyCollection).getDefaultType()); + assertEquals(Geospatial.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Geometry).getDefaultType()); + assertEquals(Point.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeometryPoint).getDefaultType()); + assertEquals(LineString.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeometryLineString).getDefaultType()); + assertEquals(Polygon.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeometryPolygon).getDefaultType()); + assertEquals(MultiPoint.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeometryMultiPoint).getDefaultType()); + assertEquals(MultiLineString.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeometryMultiLineString).getDefaultType()); + assertEquals(MultiPolygon.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeometryMultiPolygon).getDefaultType()); + assertEquals(GeospatialCollection.class, + EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.GeometryCollection).getDefaultType()); } @Test public void validate() throws Exception { - for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { + for (final EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(kind); assertTrue(instance.validate(null, null, null, null, null, null)); assertTrue(instance.validate(null, true, null, null, null, null)); @@ -175,7 +172,7 @@ public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { @Test public void uriLiteral() throws Exception { - for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { + for (final EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(kind); assertEquals("test", instance.fromUriLiteral(instance.toUriLiteral("test"))); assertNull(instance.toUriLiteral(null)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java index f5683b1..004b439 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java @@ -19,7 +19,6 @@ package org.apache.olingo.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.math.BigInteger; @@ -32,11 +31,6 @@ public class EdmByteTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte); @Test - public void compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); - } - - @Test public void toUriLiteral() throws Exception { assertEquals("127", instance.toUriLiteral("127")); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java index 1691d02..48bbb25 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java @@ -34,7 +34,6 @@ public class EdmDecimalTest extends PrimitiveTypeBaseTest { @Test public void compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16))); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java ---------------------------------------------------------------------- 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 ecd7552..5b7545d 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 @@ -34,7 +34,6 @@ public class EdmDoubleTest extends PrimitiveTypeBaseTest { @Test public void compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16))); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java index 1f5488a..368a412 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java @@ -33,7 +33,6 @@ public class EdmInt16Test extends PrimitiveTypeBaseTest { @Test public void testInt16Compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte))); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java index 948b73e..39d2904 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java @@ -33,7 +33,6 @@ public class EdmInt32Test extends PrimitiveTypeBaseTest { @Test public void compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16))); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java index ead3f78..0dc3bd7 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java @@ -33,7 +33,6 @@ public class EdmInt64Test extends PrimitiveTypeBaseTest { @Test public void compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16))); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java index 5d27aaf..16da7ca 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java @@ -19,7 +19,6 @@ package org.apache.olingo.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import java.math.BigInteger; @@ -32,11 +31,6 @@ public class EdmSByteTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte); @Test - public void compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); - } - - @Test public void toUriLiteral() throws Exception { assertEquals("127", instance.toUriLiteral("127")); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java index 5d34496..d2ca44c 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java @@ -34,7 +34,6 @@ public class EdmSingleTest extends PrimitiveTypeBaseTest { @Test public void compatibility() { - assertTrue(instance.isCompatible(Uint7.getInstance())); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte))); assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16))); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/85bebce0/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java deleted file mode 100644 index 42b473f..0000000 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.core.edm.primitivetype; - -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; - -public class UInt7Test extends PrimitiveTypeBaseTest { - - @Test - public void compatibility() { - assertTrue(Uint7.getInstance().isCompatible(Uint7.getInstance())); - assertFalse(Uint7.getInstance().isCompatible( - EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.String))); - } -}
