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/03/10 10:02:24 UTC
[08/51] [abbrv] [partial] [OLINGO-192] rename java packages
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java
deleted file mode 100644
index 7384cea..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java
+++ /dev/null
@@ -1,104 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmDurationTest extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Duration.getEdmPrimitiveTypeInstance();
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("duration'P120D'", instance.toUriLiteral("P120D"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("P120D", instance.fromUriLiteral("duration'P120D'"));
-
- expectErrorInFromUriLiteral(instance, "");
- expectErrorInFromUriLiteral(instance, "Duration'PT1S'");
- expectErrorInFromUriLiteral(instance, "duration'PT1S\"");
- }
-
- @Test
- public void valueToString() throws Exception {
- assertEquals("PT10S", instance.valueToString(BigDecimal.TEN, null, null, null, null, null));
- assertEquals("-PT10S", instance.valueToString(BigDecimal.TEN.negate(), null, null, null, null, null));
- assertEquals("PT10S", instance.valueToString(BigDecimal.TEN, null, null, null, null, null));
- assertEquals("PT10S", instance.valueToString(BigDecimal.TEN, null, null, 0, null, null));
- assertEquals("-PT0.01S", instance.valueToString(BigDecimal.ONE.movePointLeft(2).negate(), null, null, 2, null,
- null));
- assertEquals("PT2M3S", instance.valueToString(123, null, null, null, null, null));
- assertEquals("PT2M3S", instance.valueToString((byte) 123, null, null, null, null, null));
- assertEquals("PT3H25M45S", instance.valueToString((short) 12345, null, null, null, null, null));
- assertEquals("P14288DT23H31M30S", instance.valueToString(1234567890L, null, null, null, null, null));
- assertEquals("P50903316DT2H25M4S", instance.valueToString(BigInteger.ONE.shiftLeft(42), null, null, null, null,
- null));
-
- expectFacetsErrorInValueToString(instance, BigDecimal.ONE.movePointLeft(1), null, null, null, null, null);
- expectFacetsErrorInValueToString(instance, BigDecimal.ONE.movePointLeft(1), null, null, 0, null, null);
-
- expectTypeErrorInValueToString(instance, "");
- }
-
- @Test
- public void valueOfString() throws Exception {
- assertEquals(BigDecimal.TEN, instance.valueOfString("PT10S", null, null, null, null, null, BigDecimal.class));
- assertEquals(BigDecimal.TEN.negate(), instance.valueOfString("-PT10S", null, null, null, null, null,
- BigDecimal.class));
- assertEquals(BigDecimal.TEN, instance.valueOfString("PT10S", null, null, null, null, null, BigDecimal.class));
- assertEquals(BigDecimal.ONE.movePointLeft(1), instance.valueOfString("PT0.1S", null, null, 1, null, null,
- BigDecimal.class));
- assertEquals(Byte.valueOf((byte) 123), instance.valueOfString("PT2M3S", null, null, null, null, null, Byte.class));
- assertEquals(Short.valueOf((short) 123), instance.valueOfString("PT2M3S", null, null, null, null, null,
- Short.class));
- assertEquals(Integer.valueOf(12345), instance.valueOfString("PT3H25M45S", null, null, null, null, null,
- Integer.class));
- assertEquals(Long.valueOf(1234567890L), instance.valueOfString("P14288DT23H31M30S", null, null, null, null, null,
- Long.class));
- assertEquals(BigInteger.ONE.shiftLeft(42), instance.valueOfString("P50903316DT2H25M4S", null, null, null, null,
- null, BigInteger.class));
-
- expectFacetsErrorInValueOfString(instance, "PT1.1S", null, null, null, null, null);
- expectFacetsErrorInValueOfString(instance, "PT1H2M3.123S", null, null, 2, null, null);
- expectFacetsErrorInValueOfString(instance, "PT13H2M3.9S", null, null, 0, null, null);
-
- expectContentErrorInValueOfString(instance, "PT1H2M3S.1234");
- expectContentErrorInValueOfString(instance, "P2012Y2M29DT23H32M2S");
- expectContentErrorInValueOfString(instance, "PT-1H");
- expectContentErrorInValueOfString(instance, "PT");
-
- expectUnconvertibleErrorInValueOfString(instance, "-PT2M9S", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "PT2M8S", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "PT10H", Short.class);
- expectUnconvertibleErrorInValueOfString(instance, "P25000D", Integer.class);
- expectUnconvertibleErrorInValueOfString(instance, "P123456789012345D", Long.class);
- // expectUnconvertibleErrorInValueOfString(instance, "PT1.1S", BigInteger.class);
-
- expectTypeErrorInValueOfString(instance, "PT0S");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java
deleted file mode 100644
index bc39120..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java
+++ /dev/null
@@ -1,67 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.UUID;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmGuidTest extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Guid.getEdmPrimitiveTypeInstance();
-
- @Test
- public void toUriLiteral() {
- assertEquals("aabbccdd-aabb-ccdd-eeff-aabbccddeeff",
- instance.toUriLiteral("aabbccdd-aabb-ccdd-eeff-aabbccddeeff"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("aabbccdd-aabb-ccdd-eeff-aabbccddeeff",
- instance.fromUriLiteral("aabbccdd-aabb-ccdd-eeff-aabbccddeeff"));
- }
-
- @Test
- public void valueToString() throws Exception {
- final UUID uuid = UUID.randomUUID();
- assertEquals(uuid.toString(), instance.valueToString(uuid, null, null, null, null, null));
-
- expectTypeErrorInValueToString(instance, 'A');
- }
-
- @Test
- public void valueOfString() throws Exception {
- final UUID uuid = UUID.fromString("aabbccdd-aabb-ccdd-eeff-aabbccddeeff");
-
- assertEquals(uuid, instance.valueOfString("aabbccdd-aabb-ccdd-eeff-aabbccddeeff", null, null, null, null, null,
- UUID.class));
- assertEquals(uuid, instance.valueOfString("AABBCCDD-AABB-CCDD-EEFF-AABBCCDDEEFF", null, null, null, null, null,
- UUID.class));
- assertEquals(uuid, instance.valueOfString("AABBCCDD-aabb-ccdd-eeff-AABBCCDDEEFF", null, null, null, null, null,
- UUID.class));
-
- expectContentErrorInValueOfString(instance, "AABBCCDDAABBCCDDEEFFAABBCCDDEEFF");
-
- expectTypeErrorInValueOfString(instance, uuid.toString());
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java
deleted file mode 100644
index 7c51505..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java
+++ /dev/null
@@ -1,86 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigInteger;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmInt16Test extends PrimitiveTypeBaseTest {
-
- final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance();
-
- @Test
- public void testInt16Compatibility() {
- assertTrue(instance.isCompatible(Uint7.getInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance()));
- }
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("127", instance.toUriLiteral("127"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("127", instance.fromUriLiteral("127"));
- }
-
- @Test
- public void valueToString() throws Exception {
- assertEquals("0", instance.valueToString(0, null, null, null, null, null));
- assertEquals("8", instance.valueToString((byte) 8, null, null, null, null, null));
- assertEquals("16", instance.valueToString((short) 16, null, null, null, null, null));
- assertEquals("32", instance.valueToString(Integer.valueOf(32), null, null, null, null, null));
- assertEquals("255", instance.valueToString(255L, null, null, null, null, null));
- assertEquals("-32768", instance.valueToString(BigInteger.valueOf(Short.MIN_VALUE), null, null, null, null, null));
-
- expectContentErrorInValueToString(instance, 123456);
- expectContentErrorInValueToString(instance, -32769);
- expectContentErrorInValueToString(instance, BigInteger.valueOf(32768));
-
- expectTypeErrorInValueToString(instance, 1.0);
- }
-
- @Test
- public void valueOfString() throws Exception {
- assertEquals(Byte.valueOf((byte) 1), instance.valueOfString("1", null, null, null, null, null, Byte.class));
- assertEquals(Short.valueOf((short) 2), instance.valueOfString("2", null, null, null, null, null, Short.class));
- assertEquals(Short.valueOf((short) -32768), instance.valueOfString("-32768", null, null, null, null, null,
- Short.class));
- assertEquals(Short.valueOf((short) 32767), instance.valueOfString("32767", null, null, null, null, null,
- Short.class));
- assertEquals(Integer.valueOf(0), instance.valueOfString("0", null, null, null, null, null, Integer.class));
- assertEquals(Long.valueOf(-1), instance.valueOfString("-1", null, null, null, null, null, Long.class));
- assertEquals(BigInteger.TEN, instance.valueOfString("10", null, null, null, null, null, BigInteger.class));
-
- expectContentErrorInValueOfString(instance, "32768");
- expectContentErrorInValueOfString(instance, "1.0");
-
- expectUnconvertibleErrorInValueOfString(instance, "-129", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "128", Byte.class);
-
- expectTypeErrorInValueOfString(instance, "1");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java
deleted file mode 100644
index 414e984..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java
+++ /dev/null
@@ -1,87 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigInteger;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmInt32Test extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Int32.getEdmPrimitiveTypeInstance();
-
- @Test
- public void compatibility() {
- assertTrue(instance.isCompatible(Uint7.getInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance()));
- }
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("127", instance.toUriLiteral("127"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("127", instance.fromUriLiteral("127"));
- }
-
- @Test
- public void valueToString() throws Exception {
- assertEquals("0", instance.valueToString(0, null, null, null, null, null));
- assertEquals("8", instance.valueToString((byte) 8, null, null, null, null, null));
- assertEquals("16", instance.valueToString((short) 16, null, null, null, null, null));
- assertEquals("32", instance.valueToString(Integer.valueOf(32), null, null, null, null, null));
- assertEquals("255", instance.valueToString(255L, null, null, null, null, null));
- assertEquals("-2147483648", instance.valueToString(BigInteger.valueOf(Integer.MIN_VALUE), null, null, null, null,
- null));
-
- expectContentErrorInValueToString(instance, 12345678901L);
- expectContentErrorInValueToString(instance, -2147483649L);
- expectContentErrorInValueToString(instance, BigInteger.valueOf(2147483648L));
-
- expectTypeErrorInValueToString(instance, 1.0);
- }
-
- @Test
- public void valueOfString() throws Exception {
- assertEquals(Byte.valueOf((byte) 1), instance.valueOfString("1", null, null, null, null, null, Byte.class));
- assertEquals(Short.valueOf((short) 2), instance.valueOfString("2", null, null, null, null, null, Short.class));
- assertEquals(Integer.valueOf(-10000000), instance.valueOfString("-10000000", null, null, null, null, null,
- Integer.class));
- assertEquals(Long.valueOf(10000000), instance.valueOfString("10000000", null, null, null, null, null, Long.class));
- assertEquals(BigInteger.TEN, instance.valueOfString("10", null, null, null, null, null, BigInteger.class));
-
- expectContentErrorInValueOfString(instance, "-2147483649");
- expectContentErrorInValueOfString(instance, "1.0");
-
- expectUnconvertibleErrorInValueOfString(instance, "-129", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "128", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "-32769", Short.class);
- expectUnconvertibleErrorInValueOfString(instance, "32768", Short.class);
-
- expectTypeErrorInValueOfString(instance, "1");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java
deleted file mode 100644
index 35fe137..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java
+++ /dev/null
@@ -1,94 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigInteger;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmInt64Test extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Int64.getEdmPrimitiveTypeInstance();
-
- @Test
- public void compatibility() {
- assertTrue(instance.isCompatible(Uint7.getInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Int32.getEdmPrimitiveTypeInstance()));
- }
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("127", instance.toUriLiteral("127"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("127", instance.fromUriLiteral("127"));
- }
-
- @Test
- public void valueToString() throws Exception {
- assertEquals("0", instance.valueToString(0, null, null, null, null, null));
- assertEquals("8", instance.valueToString((byte) 8, null, null, null, null, null));
- assertEquals("16", instance.valueToString((short) 16, null, null, null, null, null));
- assertEquals("32", instance.valueToString(Integer.valueOf(32), null, null, null, null, null));
- assertEquals("255", instance.valueToString(255L, null, null, null, null, null));
- assertEquals("12345678901", instance.valueToString(12345678901L, null, null, null, null, null));
- assertEquals("1234567890123456789", instance.valueToString(new BigInteger("1234567890123456789"), null, null, null,
- null, null));
- assertEquals("-1234567890123456789", instance.valueToString(new BigInteger("-1234567890123456789"), null, null,
- null, null, null));
-
- expectContentErrorInValueToString(instance, new BigInteger("123456789012345678901"));
-
- expectTypeErrorInValueToString(instance, 1.0);
- }
-
- @Test
- public void valueOfString() throws Exception {
- assertEquals(Short.valueOf((short) 1), instance.valueOfString("1", null, null, null, null, null, Short.class));
- assertEquals(Integer.valueOf(2), instance.valueOfString("2", null, null, null, null, null, Integer.class));
- assertEquals(Long.valueOf(-1234567890123456789L), instance.valueOfString("-1234567890123456789", null, null, null,
- null, null, Long.class));
- assertEquals(BigInteger.ONE, instance.valueOfString("1", null, null, null, null, null, BigInteger.class));
- assertEquals(Long.valueOf(0), instance.valueOfString("0", null, null, null, null, null, Long.class));
- assertEquals(Byte.valueOf((byte) 0), instance.valueOfString("0", null, null, null, null, null, Byte.class));
-
- expectContentErrorInValueOfString(instance, "-12345678901234567890");
- expectContentErrorInValueOfString(instance, "1.0");
- expectContentErrorInValueOfString(instance, "0L");
- expectContentErrorInValueOfString(instance, "0x42");
-
- expectUnconvertibleErrorInValueOfString(instance, "-129", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "128", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "-32769", Short.class);
- expectUnconvertibleErrorInValueOfString(instance, "32768", Short.class);
- expectUnconvertibleErrorInValueOfString(instance, "-2147483649", Integer.class);
- expectUnconvertibleErrorInValueOfString(instance, "2147483648", Integer.class);
-
- expectTypeErrorInValueOfString(instance, "1");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java
deleted file mode 100644
index 9756393..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java
+++ /dev/null
@@ -1,49 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertNull;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmNullTest extends PrimitiveTypeBaseTest {
-
- @Test
- public void checkNull() throws Exception {
- for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) {
- final EdmPrimitiveType instance = kind.getEdmPrimitiveTypeInstance();
- assertNull(instance.valueToString(null, null, null, null, null, null));
- assertNull(instance.valueToString(null, true, null, null, null, null));
-
- expectNullErrorInValueToString(instance);
- }
- }
-
- @Test
- public void checkValueOfNull() throws Exception {
- for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) {
- final EdmPrimitiveType instance = kind.getEdmPrimitiveTypeInstance();
- assertNull(instance.valueOfString(null, null, null, null, null, null, instance.getDefaultType()));
- assertNull(instance.valueOfString(null, true, null, null, null, null, instance.getDefaultType()));
-
- expectNullErrorInValueOfString(instance);
- }
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java
deleted file mode 100644
index 68296e7..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java
+++ /dev/null
@@ -1,80 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigInteger;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmSByteTest extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance();
-
- @Test
- public void compatibility() {
- assertTrue(instance.isCompatible(Uint7.getInstance()));
- }
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("127", instance.toUriLiteral("127"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("127", instance.fromUriLiteral("127"));
- }
-
- @Test
- public void valueToString() throws Exception {
- assertEquals("0", instance.valueToString(0, null, null, null, null, null));
- assertEquals("8", instance.valueToString((byte) 8, null, null, null, null, null));
- assertEquals("16", instance.valueToString((short) 16, null, null, null, null, null));
- assertEquals("32", instance.valueToString(Integer.valueOf(32), null, null, null, null, null));
- assertEquals("64", instance.valueToString(64L, null, null, null, null, null));
- assertEquals("-128", instance.valueToString(BigInteger.valueOf(Byte.MIN_VALUE), null, null, null, null, null));
-
- expectContentErrorInValueToString(instance, -129);
- expectContentErrorInValueToString(instance, 128);
- expectContentErrorInValueToString(instance, BigInteger.valueOf(128));
-
- expectTypeErrorInValueToString(instance, 'A');
- }
-
- @Test
- public void valueOfString() throws Exception {
- assertEquals(Byte.valueOf((byte) 1), instance.valueOfString("1", null, null, null, null, null, Byte.class));
- assertEquals(Short.valueOf((short) -2), instance.valueOfString("-2", null, null, null, null, null, Short.class));
- assertEquals(Byte.valueOf((byte) 127), instance.valueOfString("127", null, null, null, null, null, Byte.class));
- assertEquals(Byte.valueOf((byte) -128), instance.valueOfString("-128", null, null, null, null, null, Byte.class));
- assertEquals(Integer.valueOf(0), instance.valueOfString("0", null, null, null, null, null, Integer.class));
- assertEquals(Long.valueOf(0), instance.valueOfString("0", null, null, null, null, null, Long.class));
- assertEquals(BigInteger.TEN, instance.valueOfString("10", null, null, null, null, null, BigInteger.class));
-
- expectContentErrorInValueOfString(instance, "128");
- expectContentErrorInValueOfString(instance, "-129");
- expectContentErrorInValueOfString(instance, "1.0");
-
- expectTypeErrorInValueOfString(instance, "1");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java
deleted file mode 100644
index 366a7a6..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java
+++ /dev/null
@@ -1,136 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmSingleTest extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Single.getEdmPrimitiveTypeInstance();
-
- @Test
- public void compatibility() {
- assertTrue(instance.isCompatible(Uint7.getInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Int32.getEdmPrimitiveTypeInstance()));
- assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Int64.getEdmPrimitiveTypeInstance()));
- }
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("127", instance.toUriLiteral("127"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("127", instance.fromUriLiteral("127"));
- }
-
- @Test
- public void valueToString() throws Exception {
- assertEquals("0", instance.valueToString(0, null, null, null, null, null));
- assertEquals("8", instance.valueToString((byte) 8, null, null, null, null, null));
- assertEquals("16", instance.valueToString((short) 16, null, null, null, null, null));
- assertEquals("32", instance.valueToString(Integer.valueOf(32), null, null, null, null, null));
- assertEquals("255", instance.valueToString(255L, null, null, null, null, null));
- assertEquals("0.00390625", instance.valueToString(1.0 / 256, null, null, null, null, null));
- assertEquals("4.2E-8", instance.valueToString(42e-9, null, null, null, null, null));
- assertEquals("INF", instance.valueToString(Double.POSITIVE_INFINITY, null, null, null, null, null));
- assertEquals("-INF", instance.valueToString(Double.NEGATIVE_INFINITY, null, null, null, null, null));
- assertEquals("NaN", instance.valueToString(Double.NaN, null, null, null, null, null));
- assertEquals("-0.125", instance.valueToString(-0.125f, null, null, null, null, null));
- assertEquals("INF", instance.valueToString(Float.POSITIVE_INFINITY, null, null, null, null, null));
- assertEquals("-INF", instance.valueToString(Float.NEGATIVE_INFINITY, null, null, null, null, null));
- assertEquals("NaN", instance.valueToString(Float.NaN, null, null, null, null, null));
- assertEquals("-123456.75", instance.valueToString(new BigDecimal("-123456.75"), null, null, null, null, null));
-
- expectContentErrorInValueToString(instance, 12345678L);
- expectContentErrorInValueToString(instance, new BigDecimal("123456789"));
- expectContentErrorInValueToString(instance, new BigDecimal(BigInteger.ONE, -39));
- expectContentErrorInValueToString(instance, 42e38);
- expectContentErrorInValueToString(instance, 12345.6789);
- expectContentErrorInValueToString(instance, 1E-50);
-
- expectTypeErrorInValueToString(instance, 'A');
- }
-
- @Test
- public void valueOfString() throws Exception {
- assertEquals(Float.valueOf(1.42F), instance.valueOfString("1.42", null, null, null, null, null, Float.class));
- assertEquals(Double.valueOf(-42.42), instance.valueOfString("-42.42", null, null, null, null, null, Double.class));
- assertEquals(Float.valueOf(42.0F), instance.valueOfString("42", null, null, null, null, null, Float.class));
- assertEquals(Float.valueOf(2.2E38F), instance.valueOfString("22E37", null, null, null, null, null, Float.class));
- assertEquals(Float.valueOf(1.23E-38F), instance.valueOfString("12.3E-39", null, null, null, null, null,
- Float.class));
- assertEquals(BigDecimal.TEN, instance.valueOfString("10", null, null, null, null, null, BigDecimal.class));
- assertEquals(Byte.valueOf((byte) 0), instance.valueOfString("0", null, null, null, null, null, Byte.class));
- assertEquals(Short.valueOf((short) 1), instance.valueOfString("1.00", null, null, null, null, null, Short.class));
- assertEquals(Integer.valueOf(42), instance.valueOfString("4.2E1", null, null, null, null, null, Integer.class));
- assertEquals(Long.valueOf(12345678), instance.valueOfString("12345.678E+03", null, null, null, null, null,
- Long.class));
-
- assertEquals(Float.valueOf(Float.NaN), instance.valueOfString("NaN", null, null, null, null, null, Float.class));
- assertEquals(Float.valueOf(Float.NEGATIVE_INFINITY), instance.valueOfString("-INF", null, null, null, null, null,
- Float.class));
- assertEquals(Float.valueOf(Float.POSITIVE_INFINITY), instance.valueOfString("INF", null, null, null, null, null,
- Float.class));
- assertEquals(Double.valueOf(Double.NaN), instance.valueOfString("NaN", null, null, null, null, null,
- Double.class));
- assertEquals(Double.valueOf(Double.NEGATIVE_INFINITY), instance.valueOfString("-INF", null, null, null, null, null,
- Double.class));
-
- expectContentErrorInValueOfString(instance, "0.");
- expectContentErrorInValueOfString(instance, ".0");
- expectContentErrorInValueOfString(instance, "1E-50");
- expectContentErrorInValueOfString(instance, "12345.6789");
- expectContentErrorInValueOfString(instance, "42E42");
- expectContentErrorInValueOfString(instance, "42.42.42");
- expectContentErrorInValueOfString(instance, "42.42.42");
- expectContentErrorInValueOfString(instance, "42D");
- expectContentErrorInValueOfString(instance, "0x42P4");
-
- expectUnconvertibleErrorInValueOfString(instance, "INF", BigDecimal.class);
- expectUnconvertibleErrorInValueOfString(instance, "NaN", BigDecimal.class);
- expectUnconvertibleErrorInValueOfString(instance, "-INF", Integer.class);
- expectUnconvertibleErrorInValueOfString(instance, "NaN", Integer.class);
- expectUnconvertibleErrorInValueOfString(instance, "5E-1", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "5E-1", Short.class);
- expectUnconvertibleErrorInValueOfString(instance, "5E-1", Integer.class);
- expectUnconvertibleErrorInValueOfString(instance, "5E-1", Long.class);
- expectUnconvertibleErrorInValueOfString(instance, "-129", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "128", Byte.class);
- expectUnconvertibleErrorInValueOfString(instance, "-32769", Short.class);
- expectUnconvertibleErrorInValueOfString(instance, "32768", Short.class);
- expectUnconvertibleErrorInValueOfString(instance, "-2147483.65E3", Integer.class);
- expectUnconvertibleErrorInValueOfString(instance, "2147483.65E3", Integer.class);
- expectUnconvertibleErrorInValueOfString(instance, "-1E19", Long.class);
- expectUnconvertibleErrorInValueOfString(instance, "1E19", Long.class);
-
- expectTypeErrorInValueOfString(instance, "1.42");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java
deleted file mode 100644
index ecd89fd..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java
+++ /dev/null
@@ -1,77 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmStringTest extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.String.getEdmPrimitiveTypeInstance();
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("'StringValue'", instance.toUriLiteral("StringValue"));
- assertEquals("'String''Value'", instance.toUriLiteral("String'Value"));
- assertEquals("'String''''''Value'", instance.toUriLiteral("String'''Value"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("String''Value", instance.fromUriLiteral("'String''''Value'"));
-
- expectErrorInFromUriLiteral(instance, "");
- expectErrorInFromUriLiteral(instance, "'");
- expectErrorInFromUriLiteral(instance, "'\"");
- }
-
- @Test
- public void valueToString() throws Exception {
- assertEquals("text", instance.valueToString("text", null, null, null, null, null));
- assertEquals("a\nb", instance.valueToString("a\nb", null, null, null, null, null));
- assertEquals("true", instance.valueToString(true, null, null, null, null, null));
- assertEquals("a'b", instance.valueToString("a'b", null, null, null, null, null));
-
- assertEquals("text", instance.valueToString("text", null, null, null, null, true));
- assertEquals("text", instance.valueToString("text", null, 4, null, null, null));
- assertEquals("text", instance.valueToString("text", null, Integer.MAX_VALUE, null, null, null));
-
- expectFacetsErrorInValueToString(instance, "schräg", null, null, null, null, false);
- expectFacetsErrorInValueToString(instance, "text", null, 3, null, null, null);
- }
-
- @Test
- public void valueOfString() throws Exception {
- assertEquals("text", instance.valueOfString("text", null, null, null, null, null, String.class));
- assertEquals("a\nb", instance.valueOfString("a\nb", null, null, null, null, null, String.class));
- assertEquals("true", instance.valueOfString("true", null, null, null, null, null, String.class));
- assertEquals("'a''b'", instance.valueOfString("'a''b'", null, null, null, null, null, String.class));
-
- assertEquals("text", instance.valueOfString("text", null, null, null, null, true, String.class));
- assertEquals("text", instance.valueOfString("text", null, 4, null, null, null, String.class));
- assertEquals("text", instance.valueOfString("text", null, Integer.MAX_VALUE, null, null, null, String.class));
-
- expectFacetsErrorInValueOfString(instance, "schräg", null, null, null, null, false);
- expectFacetsErrorInValueOfString(instance, "text", null, 3, null, null, null);
-
- expectTypeErrorInValueOfString(instance, "text");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java
deleted file mode 100644
index ae342f4..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java
+++ /dev/null
@@ -1,92 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.Calendar;
-import java.util.TimeZone;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.junit.Test;
-
-public class EdmTimeOfDayTest extends PrimitiveTypeBaseTest {
-
- private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.TimeOfDay.getEdmPrimitiveTypeInstance();
-
- @Test
- public void toUriLiteral() throws Exception {
- assertEquals("11:12", instance.toUriLiteral("11:12"));
- assertEquals("11:12:13.012", instance.toUriLiteral("11:12:13.012"));
- }
-
- @Test
- public void fromUriLiteral() throws Exception {
- assertEquals("11:12", instance.fromUriLiteral("11:12"));
- assertEquals("11:12:13.012", instance.fromUriLiteral("11:12:13.012"));
- }
-
- @Test
- public void valueToString() throws Exception {
- Calendar dateTime = Calendar.getInstance();
- dateTime.clear();
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT+11:30"));
- dateTime.set(1, 2, 3, 4, 5, 6);
- assertEquals("04:05:06", instance.valueToString(dateTime, null, null, null, null, null));
-
- dateTime.add(Calendar.MILLISECOND, 42);
- assertEquals("04:05:06.042", instance.valueToString(dateTime, null, null, 3, null, null));
- assertEquals("04:05:06.042", instance.valueToString(dateTime, null, null, 4, null, null));
-
- expectFacetsErrorInValueToString(instance, dateTime, null, null, null, null, null);
- expectFacetsErrorInValueToString(instance, dateTime, null, null, 2, null, null);
-
- expectTypeErrorInValueToString(instance, 0);
- }
-
- @Test
- public void valueOfString() throws Exception {
- Calendar dateTime = Calendar.getInstance();
- dateTime.clear();
- dateTime.setTimeZone(TimeZone.getTimeZone("GMT"));
-
- assertEquals(dateTime, instance.valueOfString("00:00", null, null, null, null, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("00:00:00", null, null, null, null, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("00:00:00.000000000000", null, null, null, null, null,
- Calendar.class));
-
- dateTime.set(Calendar.MILLISECOND, 999);
- assertEquals(dateTime, instance.valueOfString("00:00:00.999", null, null, 3, null, null, Calendar.class));
- assertEquals(dateTime, instance.valueOfString("00:00:00.999", null, null, 3, null, null, Calendar.class));
-
- expectFacetsErrorInValueOfString(instance, "11:12:13.123", null, null, null, null, null);
- expectFacetsErrorInValueOfString(instance, "11:12:13.123", null, null, 2, null, null);
-
- expectContentErrorInValueOfString(instance, "24:32:02");
- expectContentErrorInValueOfString(instance, "011:12:13");
- expectContentErrorInValueOfString(instance, "11:12:13:14");
- expectContentErrorInValueOfString(instance, "111213");
- expectContentErrorInValueOfString(instance, "1:2:3");
- expectContentErrorInValueOfString(instance, "11:12:13.0.1");
- expectContentErrorInValueOfString(instance, "11:12:13.");
- expectContentErrorInValueOfString(instance, "11:12:13.0000000000000");
-
- expectTypeErrorInValueOfString(instance, "11:12:13");
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java
deleted file mode 100644
index a1949ea..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java
+++ /dev/null
@@ -1,119 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType;
-import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException;
-
-public abstract class PrimitiveTypeBaseTest {
-
- private void expectErrorInValueToString(final EdmPrimitiveType instance,
- final Object value, final Boolean isNullable, final Integer maxLength,
- final Integer precision, final Integer scale, final Boolean isUnicode,
- final String messageReferenceString) {
- try {
- instance.valueToString(value, isNullable, maxLength, precision, scale, isUnicode);
- fail("Expected exception not thrown");
- } catch (final EdmPrimitiveTypeException e) {
- assertNotNull(e.getLocalizedMessage());
- assertTrue(e.getLocalizedMessage().startsWith(messageReferenceString));
- }
- }
-
- private void expectErrorInValueToString(final EdmPrimitiveType instance, final Object value,
- final String messageReference) {
- expectErrorInValueToString(instance, value, null, null, null, null, null, messageReference);
- }
-
- protected void expectTypeErrorInValueToString(final EdmPrimitiveType instance, final Object value) {
- expectErrorInValueToString(instance, value, "EdmPrimitiveTypeException.VALUE_TYPE_NOT_SUPPORTED");
- }
-
- protected void expectContentErrorInValueToString(final EdmPrimitiveType instance, final Object value) {
- expectErrorInValueToString(instance, value, "EdmPrimitiveTypeException.VALUE_ILLEGAL_CONTENT");
- }
-
- protected void expectFacetsErrorInValueToString(final EdmPrimitiveType instance, final Object value,
- final Boolean isNullable, final Integer maxLength, final Integer precision,
- final Integer scale, final Boolean isUnicode) {
- expectErrorInValueToString(instance, value, isNullable, maxLength, precision, scale, isUnicode,
- "EdmPrimitiveTypeException.VALUE_FACETS_NOT_MATCHED");
- }
-
- protected void expectNullErrorInValueToString(final EdmPrimitiveType instance) {
- expectErrorInValueToString(instance, null, false, null, null, null, null,
- "EdmPrimitiveTypeException.VALUE_NULL_NOT_ALLOWED");
- }
-
- private void expectErrorInValueOfString(final EdmPrimitiveType instance,
- final String value, final Boolean isNullable, final Integer maxLength, final Integer precision,
- final Integer scale, final Boolean isUnicode, final Class<?> returnType,
- final String messageReferenceString) {
-
- try {
- instance.valueOfString(value, isNullable, maxLength, precision, scale, isUnicode, returnType);
- fail("Expected exception not thrown");
- } catch (final EdmPrimitiveTypeException e) {
- assertNotNull(e.getLocalizedMessage());
- assertTrue(e.getLocalizedMessage().startsWith(messageReferenceString));
- }
- }
-
- protected void expectTypeErrorInValueOfString(final EdmPrimitiveType instance, final String value) {
- expectErrorInValueOfString(instance, value, null, null, null, null, null, Class.class,
- "EdmPrimitiveTypeException.VALUE_TYPE_NOT_SUPPORTED");
- }
-
- protected void expectUnconvertibleErrorInValueOfString(final EdmPrimitiveType instance, final String value,
- final Class<?> type) {
- expectErrorInValueOfString(instance, value, null, null, null, null, null, type,
- "EdmPrimitiveTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE");
- }
-
- protected void expectContentErrorInValueOfString(final EdmPrimitiveType instance, final String value) {
- expectErrorInValueOfString(instance, value, null, null, null, null, null, instance.getDefaultType(),
- "EdmPrimitiveTypeException.LITERAL_ILLEGAL_CONTENT");
- }
-
- protected void expectFacetsErrorInValueOfString(final EdmPrimitiveType instance, final String value,
- final Boolean isNullable, final Integer maxLength, final Integer precision,
- final Integer scale, final Boolean isUnicode) {
- expectErrorInValueOfString(instance, value, isNullable, maxLength, precision, scale, isUnicode,
- instance.getDefaultType(), "EdmPrimitiveTypeException.LITERAL_FACETS_NOT_MATCHED");
- }
-
- protected void expectNullErrorInValueOfString(final EdmPrimitiveType instance) {
- expectErrorInValueOfString(instance, null, false, null, null, null, null, instance.getDefaultType(),
- "EdmPrimitiveTypeException.LITERAL_NULL_NOT_ALLOWED");
- }
-
- protected void expectErrorInFromUriLiteral(final EdmPrimitiveType instance, final String value) {
- try {
- instance.fromUriLiteral(value);
- fail("Expected exception not thrown");
- } catch (final EdmPrimitiveTypeException e) {
- assertNotNull(e.getLocalizedMessage());
- assertTrue(e.getLocalizedMessage().startsWith("EdmPrimitiveTypeException.LITERAL_ILLEGAL_CONTENT"));
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java b/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java
deleted file mode 100644
index b9c25fd..0000000
--- a/lib/commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java
+++ /dev/null
@@ -1,33 +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.odata4.commons.core.edm.primitivetype;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class UInt7Test extends PrimitiveTypeBaseTest {
-
- @Test
- public void compatibility() {
- assertTrue(Uint7.getInstance().isCompatible(Uint7.getInstance()));
- assertFalse(Uint7.getInstance().isCompatible(EdmPrimitiveTypeKind.String.getEdmPrimitiveTypeInstance()));
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java
deleted file mode 100644
index ee4a3c4..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Action.java
+++ /dev/null
@@ -1,54 +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.odata4.server.api.edm.provider;
-
-import java.util.List;
-
-public class Action extends Operation {
-
- @Override
- public Action setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public Action setBound(final boolean isBound) {
- this.isBound = isBound;
- return this;
- }
-
- @Override
- public Action setEntitySetPath(final EntitySetPath entitySetPath) {
- this.entitySetPath = entitySetPath;
- return this;
- }
-
- @Override
- public Action setParameters(final List<Parameter> parameters) {
- this.parameters = parameters;
- return this;
- }
-
- @Override
- public Action setReturnType(final ReturnType returnType) {
- this.returnType = returnType;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java
deleted file mode 100644
index 9311094..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ActionImport.java
+++ /dev/null
@@ -1,48 +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.odata4.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.odata4.commons.api.edm.Target;
-
-public class ActionImport extends OperationImport {
-
- private FullQualifiedName action;
-
- @Override
- public ActionImport setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public ActionImport setEntitySet(final Target entitySet) {
- this.entitySet = entitySet;
- return this;
- }
-
- public FullQualifiedName getAction() {
- return action;
- }
-
- public ActionImport setAction(final FullQualifiedName action) {
- this.action = action;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java
deleted file mode 100644
index 3ab5b61..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/AliasInfo.java
+++ /dev/null
@@ -1,45 +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.odata4.server.api.edm.provider;
-
-public class AliasInfo {
-
- private String namespace;
-
- private String alias;
-
- public String getNamespace() {
- return namespace;
- }
-
- public AliasInfo setNamespace(final String namespace) {
- this.namespace = namespace;
- return this;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public AliasInfo setAlias(final String alias) {
- this.alias = alias;
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java
deleted file mode 100644
index 3f3280b..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Annotation.java
+++ /dev/null
@@ -1,72 +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.odata4.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class Annotation {
-
- private FullQualifiedName term;
-
- // Target should be a target path
-// private String targetPath;
- private String qualifier;
-
- private Expression expression;
-
- private List<Annotation> annotation;
-
- public FullQualifiedName getTerm() {
- return term;
- }
-
- public Annotation setTerm(final FullQualifiedName term) {
- this.term = term;
- return this;
- }
-
- public String getQualifier() {
- return qualifier;
- }
-
- public Annotation setQualifier(final String qualifier) {
- this.qualifier = qualifier;
- return this;
- }
-
- public Expression getExpression() {
- return expression;
- }
-
- public Annotation setExpression(final Expression expression) {
- this.expression = expression;
- return this;
- }
-
- public List<Annotation> getAnnotation() {
- return annotation;
- }
-
- public Annotation setAnnotation(final List<Annotation> annotation) {
- this.annotation = annotation;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java
deleted file mode 100644
index dccec29..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/BindingTarget.java
+++ /dev/null
@@ -1,60 +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.odata4.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public abstract class BindingTarget {
-
- protected String name;
-
- protected FullQualifiedName type;
-
- protected List<NavigationPropertyBinding> navigationPropertyBindings;
-
- public String getName() {
- return name;
- }
-
- public BindingTarget setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getType() {
- return type;
- }
-
- public BindingTarget setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- public List<NavigationPropertyBinding> getNavigationPropertyBindings() {
- return navigationPropertyBindings;
- }
-
- public BindingTarget setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) {
- this.navigationPropertyBindings = navigationPropertyBindings;
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java
deleted file mode 100644
index 4857b37..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ComplexType.java
+++ /dev/null
@@ -1,62 +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.odata4.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class ComplexType extends StructuredType {
-
- @Override
- public ComplexType setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public ComplexType setOpenType(final boolean isOpenType) {
- this.isOpenType = isOpenType;
- return this;
- }
-
- @Override
- public ComplexType setBaseType(final FullQualifiedName baseType) {
- this.baseType = baseType;
- return this;
- }
-
- @Override
- public ComplexType setAbstract(final boolean isAbstract) {
- this.isAbstract = isAbstract;
- return this;
- }
-
- @Override
- public ComplexType setProperties(final List<Property> properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public ComplexType setNavigationProperties(final List<NavigationProperty> navigationProperties) {
- this.navigationProperties = navigationProperties;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java
deleted file mode 100644
index 7381803..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EdmProvider.java
+++ /dev/null
@@ -1,182 +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.odata4.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.ODataException;
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public abstract class EdmProvider {
-
- /**
- * This method should return an {@link EnumType} or <b>null</b> if nothing is found
- *
- * @param enumTypeName
- * @return {@link EnumType} for given name
- * @throws ODataException
- */
- public EnumType getEnumType(final FullQualifiedName enumTypeName) throws ODataException {
- return null;
- }
-
- /**
- * This method should return an {@link TypeDefinition} or <b>null</b> if nothing is found
- *
- * @param typeDefinitionName
- * @return {@link TypeDefinition} for given name
- * @throws ODataException
- */
- public TypeDefinition getTypeDefinition(final FullQualifiedName typeDefinitionName) throws ODataException {
- return null;
- }
-
- /**
- * This method should return an {@link EntityType} or <b>null</b> if nothing is found
- *
- * @param entityTypeName
- * @return {@link EntityType} for the given name
- * @throws ODataException
- */
- public EntityType getEntityType(final FullQualifiedName entityTypeName) throws ODataException {
- return null;
- }
-
- /**
- * This method should return a {@link ComplexType} or <b>null</b> if nothing is found
- *
- * @param complexTypeName
- * @return {@link StructuralType} for the given name
- * @throws ODataException
- */
- public ComplexType getComplexType(final FullQualifiedName complexTypeName) throws ODataException {
- return null;
- }
-
- /**
- * This method should return a list of all {@link Action} for the FullQualifiedname or <b>null</b> if nothing is found
- *
- * @param actionName
- * @return List of {@link Action} or null
- * @throws ODataException
- */
- public List<Action> getActions(final FullQualifiedName actionName) throws ODataException {
- return null;
- }
-
- /**
- * This method should return a list of all {@link Function} for the FullQualifiedname or <b>null</b> if nothing is
- * found
- *
- * @param functionName
- * @return List of {@link Function} or null
- * @throws ODataException
- */
- public List<Function> getFunctions(final FullQualifiedName functionName) throws ODataException {
- return null;
- }
-
- // TODO: document
- public Term getTerm(final FullQualifiedName termName) throws ODataException {
- return null;
- }
-
- /**
- * This method should return an {@link EntitySet} or <b>null</b> if nothing is found
- *
- * @param entityContainer this EntitySet is contained in
- * @param entitySetName
- * @return {@link EntitySet} for the given container and entityset name
- * @throws ODataException
- */
- public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName)
- throws ODataException {
- return null;
- }
-
- /**
- * This method should return an {@link Singleton} or <b>null</b> if nothing is found
- *
- * @param entityContainer this Singleton is contained in
- * @param singletonName
- * @return {@link Singleton} for given container and singleton name
- * @throws ODataException
- */
- public Singleton getSingleton(final FullQualifiedName entityContainer, final String singletonName)
- throws ODataException {
- return null;
- }
-
- /**
- * This method should return an {@link ActionImport} or <b>null</b> if nothing is found
- *
- * @param entityContainer this ActionImport is contained in
- * @param actionImportName
- * @return {@link ActionImport} for the given container and ActionImport name
- * @throws ODataException
- */
- public ActionImport getActionImport(final FullQualifiedName entityContainer, final String actionImportName)
- throws ODataException {
- return null;
- }
-
- /**
- * This method should return a {@link FunctionImport} or <b>null</b> if nothing is found
- *
- * @param entityContainer this FunctionImport is contained in
- * @param functionImportName
- * @return {@link FunctionImport} for the given container name and function import name
- * @throws ODataException
- */
- public FunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String functionImportName)
- throws ODataException {
- return null;
- }
-
- /**
- * This method should return an {@link EntityContainerInfo} or <b>null</b> if nothing is found
- *
- * @param entityContainerName (null for default container)
- * @return {@link EntityContainerInfo} for the given name
- * @throws ODataException
- */
- public EntityContainerInfo getEntityContainerInfo(final FullQualifiedName entityContainerName) throws ODataException {
- return null;
- }
-
- /**
- * This method should return a list of all namespaces which have an alias
- *
- * @return List of alias info
- * @throws ODataException
- */
- public List<AliasInfo> getAliasInfos() throws ODataException {
- return null;
- }
-
- /**
- * This method should return a collection of all {@link Schema}
- *
- * @return List<{@link Schema}>
- * @throws ODataException
- */
- public List<Schema> getSchemas() throws ODataException {
- return null;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java
deleted file mode 100644
index 70a702f..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainer.java
+++ /dev/null
@@ -1,93 +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.odata4.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class EntityContainer {
-
- private String name;
-
- private FullQualifiedName extendsContainer;
-
- private List<EntitySet> entitySets;
-
- private List<ActionImport> actionImports;
-
- private List<FunctionImport> functionImports;
-
- private List<Singleton> singletons;
-
- // Annotations
- public String getName() {
- return name;
- }
-
- public EntityContainer setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getExtendsContainer() {
- return extendsContainer;
- }
-
- public EntityContainer setExtendsContainer(final FullQualifiedName extendsContainer) {
- this.extendsContainer = extendsContainer;
- return this;
- }
-
- public List<EntitySet> getEntitySets() {
- return entitySets;
- }
-
- public EntityContainer setEntitySets(final List<EntitySet> entitySets) {
- this.entitySets = entitySets;
- return this;
- }
-
- public List<ActionImport> getActionImports() {
- return actionImports;
- }
-
- public EntityContainer setActionImports(final List<ActionImport> actionImports) {
- this.actionImports = actionImports;
- return this;
- }
-
- public List<FunctionImport> getFunctionImports() {
- return functionImports;
- }
-
- public EntityContainer setFunctionImports(final List<FunctionImport> functionImports) {
- this.functionImports = functionImports;
- return this;
- }
-
- public List<Singleton> getSingletons() {
- return singletons;
- }
-
- public EntityContainer setSingletons(final List<Singleton> singletons) {
- this.singletons = singletons;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java
deleted file mode 100644
index aa08637..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityContainerInfo.java
+++ /dev/null
@@ -1,47 +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.odata4.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class EntityContainerInfo {
-
- private FullQualifiedName containerName;
-
- private FullQualifiedName extendsContainer;
-
- public FullQualifiedName getContainerName() {
- return containerName;
- }
-
- public EntityContainerInfo setContainerName(final FullQualifiedName containerName) {
- this.containerName = containerName;
- return this;
- }
-
- public FullQualifiedName getExtendsContainer() {
- return extendsContainer;
- }
-
- public EntityContainerInfo setExtendsContainer(final FullQualifiedName extendsContainer) {
- this.extendsContainer = extendsContainer;
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java
deleted file mode 100644
index 8fbfb91..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySet.java
+++ /dev/null
@@ -1,55 +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.odata4.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class EntitySet extends BindingTarget {
-
- private boolean includeInServiceDocument;
-
- @Override
- public EntitySet setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public EntitySet setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) {
- this.navigationPropertyBindings = navigationPropertyBindings;
- return this;
- }
-
- @Override
- public EntitySet setType(final FullQualifiedName entityType) {
- type = entityType;
- return this;
- }
-
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public EntitySet setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java
deleted file mode 100644
index 4df76f8..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntitySetPath.java
+++ /dev/null
@@ -1,45 +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.odata4.server.api.edm.provider;
-
-//TODO: Do we really need this class?
-public class EntitySetPath {
-
- private String bindingParameter;
-
- private String path;
-
- public String getBindingParameter() {
- return bindingParameter;
- }
-
- public EntitySetPath setBindingParameter(final String bindingParameter) {
- this.bindingParameter = bindingParameter;
- return this;
- }
-
- public String getPath() {
- return path;
- }
-
- public EntitySetPath setPath(final String path) {
- this.path = path;
- return this;
- }
-}