Return-Path: X-Original-To: apmail-olingo-commits-archive@minotaur.apache.org Delivered-To: apmail-olingo-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DEE2510636 for ; Sat, 22 Mar 2014 15:14:00 +0000 (UTC) Received: (qmail 53346 invoked by uid 500); 22 Mar 2014 15:14:00 -0000 Delivered-To: apmail-olingo-commits-archive@olingo.apache.org Received: (qmail 53277 invoked by uid 500); 22 Mar 2014 15:13:59 -0000 Mailing-List: contact commits-help@olingo.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@olingo.incubator.apache.org Delivered-To: mailing list commits@olingo.incubator.apache.org Received: (qmail 53177 invoked by uid 99); 22 Mar 2014 15:13:56 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Mar 2014 15:13:56 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 22 Mar 2014 15:13:24 +0000 Received: (qmail 52676 invoked by uid 99); 22 Mar 2014 15:12:59 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Mar 2014 15:12:59 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 22DAA948BB5; Sat, 22 Mar 2014 15:12:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ilgrosso@apache.org To: commits@olingo.incubator.apache.org Date: Sat, 22 Mar 2014 15:13:00 -0000 Message-Id: In-Reply-To: <3123c41f62be467f81196305de5933f8@git.apache.org> References: <3123c41f62be467f81196305de5933f8@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [03/11] [OLINGO-65] Geospatial types implemented, EdmStream mock implemented with URI as backend, V3 pruned types implemented, EdmSimpleTypeKind adapted, EdmSimpleTypeFactory introduces X-Virus-Checked: Checked by ClamAV on apache.org http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometry.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometry.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometry.java new file mode 100644 index 0000000..2f16e24 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometry.java @@ -0,0 +1,36 @@ +/* + * 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.geo.Geospatial; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Dimension; + +public final class EdmGeometry extends AbstractEdmGeospatialType { + + private static final EdmGeometry INSTANCE = new EdmGeometry(); + + public static EdmGeometry getInstance() { + return INSTANCE; + } + + public EdmGeometry() { + super(Geospatial.class, Dimension.GEOMETRY, null); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryCollection.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryCollection.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryCollection.java new file mode 100644 index 0000000..12c6c01 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryCollection.java @@ -0,0 +1,37 @@ +/* + * 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.geo.Geospatial.Dimension; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; +import org.apache.olingo.commons.api.edm.geo.Point; + +public final class EdmGeometryCollection extends AbstractEdmGeospatialType { + + private static final EdmGeometryCollection INSTANCE = new EdmGeometryCollection(); + + public static EdmGeometryCollection getInstance() { + return INSTANCE; + } + + public EdmGeometryCollection() { + super(Point.class, Dimension.GEOMETRY, Type.GEOSPATIALCOLLECTION); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryLineString.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryLineString.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryLineString.java new file mode 100644 index 0000000..db8cfb0 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryLineString.java @@ -0,0 +1,37 @@ +/* + * 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.geo.Geospatial.Dimension; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; +import org.apache.olingo.commons.api.edm.geo.Point; + +public final class EdmGeometryLineString extends AbstractEdmGeospatialType { + + private static final EdmGeometryLineString INSTANCE = new EdmGeometryLineString(); + + public static EdmGeometryLineString getInstance() { + return INSTANCE; + } + + public EdmGeometryLineString() { + super(Point.class, Dimension.GEOMETRY, Type.LINESTRING); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiLineString.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiLineString.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiLineString.java new file mode 100644 index 0000000..7bf89e6 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiLineString.java @@ -0,0 +1,37 @@ +/* + * 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.geo.Geospatial.Dimension; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; +import org.apache.olingo.commons.api.edm.geo.Point; + +public final class EdmGeometryMultiLineString extends AbstractEdmGeospatialType { + + private static final EdmGeometryMultiLineString INSTANCE = new EdmGeometryMultiLineString(); + + public static EdmGeometryMultiLineString getInstance() { + return INSTANCE; + } + + public EdmGeometryMultiLineString() { + super(Point.class, Dimension.GEOMETRY, Type.MULTILINESTRING); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPoint.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPoint.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPoint.java new file mode 100644 index 0000000..9311d8d --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPoint.java @@ -0,0 +1,37 @@ +/* + * 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.geo.Geospatial.Dimension; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; +import org.apache.olingo.commons.api.edm.geo.Point; + +public final class EdmGeometryMultiPoint extends AbstractEdmGeospatialType { + + private static final EdmGeometryMultiPoint INSTANCE = new EdmGeometryMultiPoint(); + + public static EdmGeometryMultiPoint getInstance() { + return INSTANCE; + } + + public EdmGeometryMultiPoint() { + super(Point.class, Dimension.GEOMETRY, Type.MULTIPOINT); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPolygon.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPolygon.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPolygon.java new file mode 100644 index 0000000..f64ed87 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryMultiPolygon.java @@ -0,0 +1,37 @@ +/* + * 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.geo.Geospatial.Dimension; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; +import org.apache.olingo.commons.api.edm.geo.Point; + +public final class EdmGeometryMultiPolygon extends AbstractEdmGeospatialType { + + private static final EdmGeometryMultiPolygon INSTANCE = new EdmGeometryMultiPolygon(); + + public static EdmGeometryMultiPolygon getInstance() { + return INSTANCE; + } + + public EdmGeometryMultiPolygon() { + super(Point.class, Dimension.GEOMETRY, Type.MULTIPOLYGON); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPoint.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPoint.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPoint.java new file mode 100644 index 0000000..ba8e5d2 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPoint.java @@ -0,0 +1,37 @@ +/* + * 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.geo.Geospatial.Dimension; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; +import org.apache.olingo.commons.api.edm.geo.Point; + +public final class EdmGeometryPoint extends AbstractEdmGeospatialType { + + private static final EdmGeometryPoint INSTANCE = new EdmGeometryPoint(); + + public static EdmGeometryPoint getInstance() { + return INSTANCE; + } + + public EdmGeometryPoint() { + super(Point.class, Dimension.GEOMETRY, Type.POINT); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPolygon.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPolygon.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPolygon.java new file mode 100644 index 0000000..12f8cf1 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeometryPolygon.java @@ -0,0 +1,37 @@ +/* + * 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.geo.Geospatial.Dimension; +import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; +import org.apache.olingo.commons.api.edm.geo.Point; + +public final class EdmGeometryPolygon extends AbstractEdmGeospatialType { + + private static final EdmGeometryPolygon INSTANCE = new EdmGeometryPolygon(); + + public static EdmGeometryPolygon getInstance() { + return INSTANCE; + } + + public EdmGeometryPolygon() { + super(Point.class, Dimension.GEOMETRY, Type.POLYGON); + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNull.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNull.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNull.java deleted file mode 100644 index 57b1218..0000000 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNull.java +++ /dev/null @@ -1,75 +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; - -//TODO: Is this class still necessary? -/** - * Implementation of the simple type Null. - */ -public final class EdmNull extends SingletonPrimitiveType { - - private static final EdmNull INSTANCE = new EdmNull(); - - public static EdmNull getInstance() { - return INSTANCE; - } - - @Override - public boolean equals(final Object obj) { - return this == obj || obj == null; - } - - @Override - public int hashCode() { - return 0; - } - - @Override - public Class getDefaultType() { - return null; - } - - @Override - protected T internalValueOfString(final String value, - final Boolean isNullable, final Integer maxLength, final Integer precision, - final Integer scale, final Boolean isUnicode, final Class returnType) throws EdmPrimitiveTypeException { - - return null; - } - - @Override - protected String internalValueToString(final T value, - final Boolean isNullable, final Integer maxLength, final Integer precision, - final Integer scale, final Boolean isUnicode) throws EdmPrimitiveTypeException { - - return null; - } - - @Override - public String toUriLiteral(final String literal) { - return "null"; - } - - @Override - public String fromUriLiteral(final String literal) throws EdmPrimitiveTypeException { - return null; - } -} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeFactory.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeFactory.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeFactory.java new file mode 100644 index 0000000..83a257d --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeFactory.java @@ -0,0 +1,138 @@ +/* + * 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.EdmGeospatialType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmType; + +public final class EdmPrimitiveTypeFactory { + + public static EdmType getInstance(final EdmPrimitiveTypeKind kind) { + return kind.isGeospatial() + ? getGeoInstance(kind) + : getNonGeoInstance(kind); + } + + /** + * Returns an instance for the provided {@link EdmPrimitiveTypeKind} in the form of {@link EdmPrimitiveType} (for + * non-geospatial types). + * + * @param kind EdmPrimitiveTypeKind + * @return {@link EdmPrimitiveType} instance + */ + public static EdmPrimitiveType getNonGeoInstance(final EdmPrimitiveTypeKind kind) { + switch (kind) { + case Binary: + return EdmBinary.getInstance(); + case Boolean: + return EdmBoolean.getInstance(); + case Byte: + return EdmByte.getInstance(); + case SByte: + return EdmSByte.getInstance(); + case Date: + return EdmDate.getInstance(); + case DateTime: + return EdmDateTime.getInstance(); + case DateTimeOffset: + return EdmDateTimeOffset.getInstance(); + case Time: + return EdmTime.getInstance(); + case TimeOfDay: + return EdmTimeOfDay.getInstance(); + case Duration: + return EdmDuration.getInstance(); + case Decimal: + return EdmDecimal.getInstance(); + case Single: + return EdmSingle.getInstance(); + case Double: + return EdmDouble.getInstance(); + case Guid: + return EdmGuid.getInstance(); + case Int16: + return EdmInt16.getInstance(); + case Int32: + return EdmInt32.getInstance(); + case Int64: + return EdmInt64.getInstance(); + case String: + return EdmString.getInstance(); + case Stream: + return EdmStream.getInstance(); + + default: + throw new IllegalArgumentException("Wrong type: " + kind); + } + } + + /** + * Returns an instance for the provided {@link EdmPrimitiveTypeKind} in the form of {@link EdmGeospatialType}. + * + * @param kind EdmPrimitiveTypeKind + * @return {@link EdmGeospatialType} instance + */ + public static EdmGeospatialType getGeoInstance(final EdmPrimitiveTypeKind kind) { + switch (kind) { + case Geography: + return EdmGeography.getInstance(); + case GeographyPoint: + return EdmGeographyPoint.getInstance(); + case GeographyLineString: + return EdmGeographyLineString.getInstance(); + case GeographyPolygon: + return EdmGeographyPolygon.getInstance(); + case GeographyMultiPoint: + return EdmGeographyMultiPoint.getInstance(); + case GeographyMultiLineString: + return EdmGeographyMultiLineString.getInstance(); + case GeographyMultiPolygon: + return EdmGeographyMultiPolygon.getInstance(); + case GeographyCollection: + return EdmGeographyCollection.getInstance(); + case Geometry: + return EdmGeometry.getInstance(); + case GeometryPoint: + return EdmGeometry.getInstance(); + case GeometryLineString: + return EdmGeometryLineString.getInstance(); + case GeometryPolygon: + return EdmGeometryPolygon.getInstance(); + case GeometryMultiPoint: + return EdmGeometryMultiPoint.getInstance(); + case GeometryMultiLineString: + return EdmGeographyMultiLineString.getInstance(); + case GeometryMultiPolygon: + return EdmGeometryMultiPolygon.getInstance(); + case GeometryCollection: + return EdmGeometryCollection.getInstance(); + + default: + throw new IllegalArgumentException("Wrong type: " + kind); + + } + } + + private EdmPrimitiveTypeFactory() { + // empty constructor for static utility class + } + +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java deleted file mode 100644 index e368607..0000000 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java +++ /dev/null @@ -1,95 +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.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -//TODO: Should we delete this typekind and use a facade? -public enum EdmPrimitiveTypeKind { - - Binary, Boolean, Byte, Date, DateTimeOffset, Decimal, Double, Duration, Guid, - Int16, Int32, Int64, SByte, Single, String, TimeOfDay; - - /** - * Returns the {@link FullQualifiedName} for this type kind. - * - * @return {@link FullQualifiedName} - */ - public FullQualifiedName getFullQualifiedName() { - return new FullQualifiedName(EdmPrimitiveType.EDM_NAMESPACE, toString()); - } - - /** - * Returns an instance for this {@link EdmPrimitiveTypeKind} in the form of {@link EdmPrimitiveType}. - * - * @return {@link EdmPrimitiveType} instance - */ - public EdmPrimitiveType getEdmPrimitiveTypeInstance() { - switch (this) { - case Binary: - return EdmBinary.getInstance(); - case Boolean: - return EdmBoolean.getInstance(); - case Byte: - return EdmByte.getInstance(); - case Date: - return EdmDate.getInstance(); - case DateTimeOffset: - return EdmDateTimeOffset.getInstance(); - case Decimal: - return EdmDecimal.getInstance(); - case Double: - return EdmDouble.getInstance(); - case Duration: - return EdmDuration.getInstance(); - case Guid: - return EdmGuid.getInstance(); - case Int16: - return EdmInt16.getInstance(); - case Int32: - return EdmInt32.getInstance(); - case Int64: - return EdmInt64.getInstance(); - case SByte: - return EdmSByte.getInstance(); - case Single: - return EdmSingle.getInstance(); - case String: - return EdmString.getInstance(); - case TimeOfDay: - return EdmTimeOfDay.getInstance(); - default: - throw new RuntimeException("Wrong type:" + this); - } - } - - /** - * Gets EdmPrimitiveTypeKind from a full string (e.g. 'Edm.Int32'). - * - * @param value string value type. - * @return EdmPrimitiveTypeKind object. - */ - public static EdmPrimitiveTypeKind valueOfFQN(final String value) { - if (!value.startsWith(EdmPrimitiveType.EDM_NAMESPACE + ".")) { - throw new IllegalArgumentException(value + " does not look like an Edm primitive type"); - } - return valueOf(value.substring(4)); - } -} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java new file mode 100644 index 0000000..75b6291 --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java @@ -0,0 +1,88 @@ +/* + * 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 java.net.URI; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + +/** + * Implementation of the EDM primitive type Stream as URI. + */ +public final class EdmStream extends SingletonPrimitiveType { + + private static final EdmStream INSTANCE = new EdmStream(); + + public static EdmStream getInstance() { + return INSTANCE; + } + + @Override + public Class getDefaultType() { + return URI.class; + } + + @Override + public boolean validate(final String value, final Boolean isNullable, final Integer maxLength, + final Integer precision, final Integer scale, final Boolean isUnicode) { + + if (value == null) { + return isNullable == null || isNullable; + } + + try { + new URI(value); + return true; + } catch (Exception e) { + return false; + } + } + + @Override + protected T internalValueOfString(final String value, + final Boolean isNullable, final Integer maxLength, final Integer precision, + final Integer scale, final Boolean isUnicode, final Class returnType) throws EdmPrimitiveTypeException { + + URI stream = null; + try { + stream = new URI(value); + } catch (Exception e) { + throw new EdmPrimitiveTypeException("EdmPrimitiveTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value)", e); + } + + if (returnType.isAssignableFrom(URI.class)) { + return returnType.cast(stream); + } else { + throw new EdmPrimitiveTypeException( + "EdmPrimitiveTypeException.VALUE_TYPE_NOT_SUPPORTED.addContent(returnType)"); + } + } + + @Override + protected String internalValueToString(final T value, + final Boolean isNullable, final Integer maxLength, final Integer precision, + final Integer scale, final Boolean isUnicode) throws EdmPrimitiveTypeException { + + if (value instanceof URI) { + return ((URI) value).toASCIIString(); + } else { + throw new EdmPrimitiveTypeException( + "EdmPrimitiveTypeException.VALUE_TYPE_NOT_SUPPORTED.addContent(value.getClass())"); + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTime.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTime.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTime.java new file mode 100644 index 0000000..75e80cf --- /dev/null +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTime.java @@ -0,0 +1,77 @@ +/* + * 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 javax.xml.datatype.DatatypeFactory; +import javax.xml.datatype.Duration; + +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + +/** + * Implementation of the EDM primitive type Time. + */ +public final class EdmTime extends SingletonPrimitiveType { + + private static final EdmTime INSTANCE = new EdmTime(); + + public static EdmTime getInstance() { + return INSTANCE; + } + + @Override + public Class getDefaultType() { + return Duration.class; + } + + @Override + protected T internalValueOfString(final String value, + final Boolean isNullable, final Integer maxLength, final Integer precision, + final Integer scale, final Boolean isUnicode, final Class returnType) throws EdmPrimitiveTypeException { + + Duration duration = null; + try { + final DatatypeFactory dtFactory = DatatypeFactory.newInstance(); + duration = dtFactory.newDuration(value); + } catch (Exception e) { + throw new EdmPrimitiveTypeException("EdmPrimitiveTypeException.LITERAL_ILLEGAL_CONTENT.addContent(value)", e); + } + + if (returnType.isAssignableFrom(Duration.class)) { + return returnType.cast(duration); + } else { + throw new EdmPrimitiveTypeException( + "EdmPrimitiveTypeException.LITERAL_UNCONVERTIBLE_TO_VALUE_TYPE.addContent(value, returnType)"); + } + } + + @Override + protected String internalValueToString(final T value, + final Boolean isNullable, final Integer maxLength, final Integer precision, + final Integer scale, final Boolean isUnicode) throws EdmPrimitiveTypeException { + + if (value instanceof Duration) { + final Duration duration = (Duration) value; + return duration.toString(); + } else { + throw new EdmPrimitiveTypeException( + "EdmPrimitiveTypeException.VALUE_TYPE_NOT_SUPPORTED.addContent(value.getClass())"); + } + + } +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 18b0dc6..dba916b 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 @@ -28,10 +28,9 @@ import java.util.Calendar; 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.core.edm.primitivetype.EdmNull; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; import org.junit.Test; public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { @@ -40,9 +39,11 @@ public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { public void nameSpace() throws Exception { assertEquals(EdmPrimitiveType.SYSTEM_NAMESPACE, Uint7.getInstance().getNamespace()); - assertEquals(EdmPrimitiveType.EDM_NAMESPACE, EdmNull.getInstance().getNamespace()); + assertEquals(EdmPrimitiveType.EDM_NAMESPACE, EdmInt32.getInstance().getNamespace()); for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - final EdmPrimitiveType instance = kind.getEdmPrimitiveTypeInstance(); + final EdmType instance = kind.isGeospatial() + ? EdmPrimitiveTypeFactory.getGeoInstance(kind) + : EdmPrimitiveTypeFactory.getNonGeoInstance(kind); assertEquals(EdmPrimitiveType.EDM_NAMESPACE, instance.getNamespace()); } } @@ -51,29 +52,33 @@ public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { public void names() throws Exception { assertEquals("Uint7", Uint7.getInstance().getName()); - assertEquals("Null", EdmNull.getInstance().getName()); - assertEquals("Binary", EdmPrimitiveTypeKind.Binary.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Boolean", EdmPrimitiveTypeKind.Boolean.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Byte", EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Date", EdmPrimitiveTypeKind.Date.getEdmPrimitiveTypeInstance().getName()); - assertEquals("DateTimeOffset", EdmPrimitiveTypeKind.DateTimeOffset.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Decimal", EdmPrimitiveTypeKind.Decimal.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Double", EdmPrimitiveTypeKind.Double.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Duration", EdmPrimitiveTypeKind.Duration.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Guid", EdmPrimitiveTypeKind.Guid.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Int16", EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Int32", EdmPrimitiveTypeKind.Int32.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Int64", EdmPrimitiveTypeKind.Int64.getEdmPrimitiveTypeInstance().getName()); - assertEquals("SByte", EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance().getName()); - assertEquals("Single", EdmPrimitiveTypeKind.Single.getEdmPrimitiveTypeInstance().getName()); - assertEquals("String", EdmPrimitiveTypeKind.String.getEdmPrimitiveTypeInstance().getName()); - assertEquals("TimeOfDay", EdmPrimitiveTypeKind.TimeOfDay.getEdmPrimitiveTypeInstance().getName()); + assertEquals("Binary", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Binary).getName()); + assertEquals("Boolean", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Boolean).getName()); + assertEquals("Byte", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte).getName()); + assertEquals("Date", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Date).getName()); + assertEquals("DateTimeOffset", + EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.DateTimeOffset).getName()); + assertEquals("Decimal", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Decimal).getName()); + assertEquals("Double", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Double).getName()); + assertEquals("Duration", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Duration).getName()); + assertEquals("Guid", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Guid).getName()); + assertEquals("Int16", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16).getName()); + assertEquals("Int32", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32).getName()); + assertEquals("Int64", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int64).getName()); + assertEquals("SByte", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte).getName()); + assertEquals("Single", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Single).getName()); + assertEquals("String", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.String).getName()); + assertEquals("TimeOfDay", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.TimeOfDay).getName()); } @Test public void kind() throws Exception { for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - assertEquals(EdmTypeKind.PRIMITIVE, kind.getEdmPrimitiveTypeInstance().getKind()); + if (kind.isGeospatial()) { + assertEquals(EdmTypeKind.PRIMITIVE, EdmPrimitiveTypeFactory.getGeoInstance(kind).getKind()); + } else { + assertEquals(EdmTypeKind.PRIMITIVE, EdmPrimitiveTypeFactory.getNonGeoInstance(kind).getKind()); + } } } @@ -81,95 +86,113 @@ public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { public void toStringAll() throws Exception { assertEquals("System.Uint7", Uint7.getInstance().toString()); - assertEquals("Edm.Null", EdmNull.getInstance().toString()); - assertEquals("Edm.Binary", EdmPrimitiveTypeKind.Binary.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Boolean", EdmPrimitiveTypeKind.Boolean.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Byte", EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Date", EdmPrimitiveTypeKind.Date.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.DateTimeOffset", EdmPrimitiveTypeKind.DateTimeOffset.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Decimal", EdmPrimitiveTypeKind.Decimal.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Double", EdmPrimitiveTypeKind.Double.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Duration", EdmPrimitiveTypeKind.Duration.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Guid", EdmPrimitiveTypeKind.Guid.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Int16", EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Int32", EdmPrimitiveTypeKind.Int32.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Int64", EdmPrimitiveTypeKind.Int64.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.SByte", EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.Single", EdmPrimitiveTypeKind.Single.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.String", EdmPrimitiveTypeKind.String.getEdmPrimitiveTypeInstance().toString()); - assertEquals("Edm.TimeOfDay", EdmPrimitiveTypeKind.TimeOfDay.getEdmPrimitiveTypeInstance().toString()); + assertEquals("Edm.Binary", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Binary).toString()); + assertEquals("Edm.Boolean", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Boolean).toString()); + assertEquals("Edm.Byte", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte).toString()); + assertEquals("Edm.Date", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Date).toString()); + assertEquals("Edm.DateTimeOffset", + EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.DateTimeOffset).toString()); + assertEquals("Edm.Decimal", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Decimal).toString()); + assertEquals("Edm.Double", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Double).toString()); + assertEquals("Edm.Duration", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Duration).toString()); + assertEquals("Edm.Guid", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Guid).toString()); + assertEquals("Edm.Int16", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16).toString()); + assertEquals("Edm.Int32", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32).toString()); + assertEquals("Edm.Int64", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int64).toString()); + assertEquals("Edm.SByte", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte).toString()); + assertEquals("Edm.Single", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Single).toString()); + assertEquals("Edm.String", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.String).toString()); + assertEquals("Edm.TimeOfDay", EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.TimeOfDay).toString()); for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - final EdmPrimitiveType instance = kind.getEdmPrimitiveTypeInstance(); - assertEquals(instance.toString(), kind.getFullQualifiedName().toString()); + if (!kind.isGeospatial()) { + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(kind); + assertEquals(instance.toString(), kind.getFullQualifiedName().toString()); + } } } @Test public void compatibility() { for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - final EdmPrimitiveType instance = kind.getEdmPrimitiveTypeInstance(); - assertTrue(instance.isCompatible(instance)); - assertFalse(instance.isCompatible( - (kind == EdmPrimitiveTypeKind.String ? EdmPrimitiveTypeKind.Binary : EdmPrimitiveTypeKind.String) - .getEdmPrimitiveTypeInstance())); + if (!kind.isGeospatial()) { + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(kind); + assertTrue(instance.isCompatible(instance)); + assertFalse(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance( + (kind == EdmPrimitiveTypeKind.String ? EdmPrimitiveTypeKind.Binary : EdmPrimitiveTypeKind.String)))); + } } } @Test public void defaultType() throws Exception { assertEquals(Byte.class, Uint7.getInstance().getDefaultType()); - assertNull(EdmNull.getInstance().getDefaultType()); - - assertEquals(byte[].class, EdmPrimitiveTypeKind.Binary.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Boolean.class, EdmPrimitiveTypeKind.Boolean.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Short.class, EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Calendar.class, EdmPrimitiveTypeKind.Date.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Calendar.class, EdmPrimitiveTypeKind.DateTimeOffset.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(BigDecimal.class, EdmPrimitiveTypeKind.Decimal.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Double.class, EdmPrimitiveTypeKind.Double.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(BigDecimal.class, EdmPrimitiveTypeKind.Duration.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(UUID.class, EdmPrimitiveTypeKind.Guid.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Short.class, EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Integer.class, EdmPrimitiveTypeKind.Int32.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Long.class, EdmPrimitiveTypeKind.Int64.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Byte.class, EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Float.class, EdmPrimitiveTypeKind.Single.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(String.class, EdmPrimitiveTypeKind.String.getEdmPrimitiveTypeInstance().getDefaultType()); - assertEquals(Calendar.class, EdmPrimitiveTypeKind.TimeOfDay.getEdmPrimitiveTypeInstance().getDefaultType()); + + assertEquals(byte[].class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Binary).getDefaultType()); + assertEquals(Boolean.class, + EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Boolean).getDefaultType()); + assertEquals(Short.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte).getDefaultType()); + assertEquals(Calendar.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Date).getDefaultType()); + assertEquals(Calendar.class, + EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.DateTimeOffset).getDefaultType()); + assertEquals(BigDecimal.class, + EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Decimal).getDefaultType()); + assertEquals(Double.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Double).getDefaultType()); + assertEquals(BigDecimal.class, + EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Duration).getDefaultType()); + assertEquals(UUID.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Guid).getDefaultType()); + assertEquals(Short.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16).getDefaultType()); + assertEquals(Integer.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32).getDefaultType()); + assertEquals(Long.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int64).getDefaultType()); + assertEquals(Byte.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte).getDefaultType()); + assertEquals(Float.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Single).getDefaultType()); + assertEquals(String.class, EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.String).getDefaultType()); + assertEquals(Calendar.class, + EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.TimeOfDay).getDefaultType()); } @Test public void validate() throws Exception { for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - final EdmPrimitiveType instance = kind.getEdmPrimitiveTypeInstance(); - assertTrue(instance.validate(null, null, null, null, null, null)); - assertTrue(instance.validate(null, true, null, null, null, null)); - assertFalse(instance.validate(null, false, null, null, null, null)); - assertFalse(instance.validate("ä", null, null, null, null, false)); - if (kind != EdmPrimitiveTypeKind.String && kind != EdmPrimitiveTypeKind.Binary) { - assertFalse(instance.validate("", null, null, null, null, null)); - } - if (kind != EdmPrimitiveTypeKind.String) { - assertFalse(instance.validate("ä", null, null, null, null, null)); + if (!kind.isGeospatial()) { + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(kind); + assertTrue(instance.validate(null, null, null, null, null, null)); + assertTrue(instance.validate(null, true, null, null, null, null)); + assertFalse(instance.validate(null, false, null, null, null, null)); + if (kind != EdmPrimitiveTypeKind.Stream) { + assertFalse(instance.validate("ä", null, null, null, null, false)); + } + if (kind != EdmPrimitiveTypeKind.String && kind != EdmPrimitiveTypeKind.Binary + && kind != EdmPrimitiveTypeKind.Stream) { + + assertFalse(instance.validate("", null, null, null, null, null)); + } + if (kind != EdmPrimitiveTypeKind.String && kind != EdmPrimitiveTypeKind.Stream) { + assertFalse(instance.validate("ä", null, null, null, null, null)); + } } } - assertTrue(EdmPrimitiveTypeKind.Binary.getEdmPrimitiveTypeInstance().validate("abcd", null, 3, null, null, null)); - assertFalse(EdmPrimitiveTypeKind.Binary.getEdmPrimitiveTypeInstance().validate("abcd", null, 2, null, null, null)); + assertTrue(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Binary). + validate("abcd", null, 3, null, null, null)); + assertFalse(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Binary). + validate("abcd", null, 2, null, null, null)); - assertTrue(EdmPrimitiveTypeKind.Decimal.getEdmPrimitiveTypeInstance().validate("1", null, null, null, null, - null)); - assertFalse(EdmPrimitiveTypeKind.Decimal.getEdmPrimitiveTypeInstance().validate("1.2", null, null, null, 0, null)); + assertTrue(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Decimal). + validate("1", null, null, null, null, null)); + assertFalse(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Decimal). + validate("1.2", null, null, null, 0, null)); } @Test public void uriLiteral() throws Exception { for (EdmPrimitiveTypeKind kind : EdmPrimitiveTypeKind.values()) { - final EdmPrimitiveType instance = kind.getEdmPrimitiveTypeInstance(); - assertEquals("test", instance.fromUriLiteral(instance.toUriLiteral("test"))); - assertNull(instance.toUriLiteral(null)); - assertNull(instance.fromUriLiteral(null)); + if (!kind.isGeospatial()) { + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(kind); + assertEquals("test", instance.fromUriLiteral(instance.toUriLiteral("test"))); + assertNull(instance.toUriLiteral(null)); + assertNull(instance.fromUriLiteral(null)); + } } } } http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java index 39fd38c..c3ff01c 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java @@ -25,12 +25,12 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmBinaryTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Binary.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Binary); @Test public void validate() throws Exception { @@ -64,14 +64,14 @@ public class EdmBinaryTest extends PrimitiveTypeBaseTest { @Test public void valueToString() throws Exception { - final byte[] binary = new byte[] { (byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD, (byte) 0xEE, (byte) 0xFF }; + final byte[] binary = new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD, (byte) 0xEE, (byte) 0xFF}; assertEquals("qrvM3e7_", instance.valueToString(binary, null, null, null, null, null)); assertEquals("qrvM3e7_", instance.valueToString(binary, null, 6, null, null, null)); assertEquals("qrvM3e7_", instance.valueToString(binary, null, Integer.MAX_VALUE, null, null, null)); - assertEquals("qg", instance.valueToString(new Byte[] { new Byte((byte) 170) }, null, null, null, null, null)); + assertEquals("qg", instance.valueToString(new Byte[]{new Byte((byte) 170)}, null, null, null, null, null)); expectFacetsErrorInValueToString(instance, binary, null, 3, null, null, null); @@ -80,23 +80,23 @@ public class EdmBinaryTest extends PrimitiveTypeBaseTest { @Test public void valueOfString() throws Exception { - final byte[] binary = new byte[] { (byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD, (byte) 0xEE, (byte) 0xFF }; + final byte[] binary = new byte[]{(byte) 0xAA, (byte) 0xBB, (byte) 0xCC, (byte) 0xDD, (byte) 0xEE, (byte) 0xFF}; assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7_", null, null, null, null, null, byte[].class))); - assertTrue(Arrays.equals(new Byte[] { binary[0], binary[1], binary[2] }, instance.valueOfString("qrvM", null, null, - null, null, null, Byte[].class))); + assertTrue(Arrays.equals(new Byte[]{binary[0], binary[1], binary[2]}, instance.valueOfString("qrvM", null, null, + null, null, null, Byte[].class))); assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7_", null, 6, null, null, null, byte[].class))); - assertTrue(Arrays.equals(new byte[] { 42 }, instance.valueOfString("Kg==", null, 1, null, null, null, - byte[].class))); - assertTrue(Arrays.equals(new byte[] { 42 }, instance.valueOfString("Kg", null, 1, null, null, null, - byte[].class))); - assertTrue(Arrays.equals(new byte[] { 1, 2 }, instance.valueOfString("AQI=", null, 2, null, null, null, - byte[].class))); + assertTrue(Arrays.equals(new byte[]{42}, instance.valueOfString("Kg==", null, 1, null, null, null, + byte[].class))); + assertTrue(Arrays.equals(new byte[]{42}, instance.valueOfString("Kg", null, 1, null, null, null, + byte[].class))); + assertTrue(Arrays.equals(new byte[]{1, 2}, instance.valueOfString("AQI=", null, 2, null, null, null, + byte[].class))); assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7_", null, 6, null, null, null, - byte[].class))); + byte[].class))); assertTrue(Arrays.equals(binary, instance.valueOfString("qrvM3e7_", null, Integer.MAX_VALUE, null, null, null, - byte[].class))); + byte[].class))); expectFacetsErrorInValueOfString(instance, "qrvM3e7_", null, 3, null, null, null); expectContentErrorInValueOfString(instance, "@"); http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java index 1abca66..d1e6580 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java @@ -21,12 +21,12 @@ package org.apache.olingo.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmBooleanTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Boolean.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Boolean); @Test public void toUriLiteral() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 ddf819f..c560c39 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 @@ -24,13 +24,12 @@ import static org.junit.Assert.assertTrue; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmByteTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte); @Test public void compatibility() { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java index 3d966bc..6cc3d19 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java @@ -25,12 +25,12 @@ import java.util.Date; import java.util.TimeZone; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmDateTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Date.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Date); @Test public void toUriLiteral() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java index f92fbec..bcc0123 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java @@ -26,12 +26,12 @@ import java.util.Date; import java.util.TimeZone; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmDateTimeOffsetTest extends PrimitiveTypeBaseTest { - final EdmPrimitiveType instance = EdmPrimitiveTypeKind.DateTimeOffset.getEdmPrimitiveTypeInstance(); + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.DateTimeOffset); @Test public void toUriLiteral() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 9f987a7..35917af 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 @@ -25,24 +25,23 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmDecimalTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Decimal.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Decimal); @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())); - assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Single.getEdmPrimitiveTypeInstance())); - assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Double.getEdmPrimitiveTypeInstance())); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int64))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Single))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Double))); } @Test http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 abb3a6b..57403ce 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 @@ -25,23 +25,22 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmDoubleTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Double.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Double); @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())); - assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Single.getEdmPrimitiveTypeInstance())); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int64))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Single))); } @Test http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java index 7b97f7e..85745b4 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java @@ -24,12 +24,12 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmDurationTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Duration.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Duration); @Test public void toUriLiteral() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java index c6d73ca..f69eddc 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java @@ -23,12 +23,12 @@ import static org.junit.Assert.assertEquals; import java.util.UUID; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmGuidTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Guid.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Guid); @Test public void toUriLiteral() { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 458e1d4..55c12bb 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 @@ -24,19 +24,18 @@ import static org.junit.Assert.assertTrue; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmInt16Test extends PrimitiveTypeBaseTest { - final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Int16.getEdmPrimitiveTypeInstance(); + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16); @Test public void testInt16Compatibility() { assertTrue(instance.isCompatible(Uint7.getInstance())); - assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.Byte.getEdmPrimitiveTypeInstance())); - assertTrue(instance.isCompatible(EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance())); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte))); } @Test http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 f0ada7e..e3410d7 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 @@ -24,20 +24,19 @@ import static org.junit.Assert.assertTrue; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmInt32Test extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Int32.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32); @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(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16))); } @Test http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 d704770..f45ab49 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 @@ -24,21 +24,20 @@ import static org.junit.Assert.assertTrue; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmInt64Test extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Int64.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int64); @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(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32))); } @Test http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java index 3a9daaf..5450be8 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java @@ -21,7 +21,7 @@ package org.apache.olingo.commons.core.edm.primitivetype; import static org.junit.Assert.assertNull; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmNullTest extends PrimitiveTypeBaseTest { @@ -29,22 +29,26 @@ 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)); + if (!kind.isGeospatial()) { + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(kind); + assertNull(instance.valueToString(null, null, null, null, null, null)); + assertNull(instance.valueToString(null, true, null, null, null, null)); - expectNullErrorInValueToString(instance); + 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())); + if (!kind.isGeospatial()) { + final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(kind); + assertNull(instance.valueOfString(null, null, null, null, null, null, instance.getDefaultType())); + assertNull(instance.valueOfString(null, true, null, null, null, null, instance.getDefaultType())); - expectNullErrorInValueOfString(instance); + expectNullErrorInValueOfString(instance); + } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 0ebb342..88835e9 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 @@ -24,13 +24,12 @@ import static org.junit.Assert.assertTrue; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmSByteTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.SByte.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte); @Test public void compatibility() { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/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 67847c7..9e90f22 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 @@ -25,22 +25,21 @@ import java.math.BigDecimal; import java.math.BigInteger; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.core.edm.primitivetype.Uint7; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmSingleTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.Single.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Single); @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())); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Byte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.SByte))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int16))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int32))); + assertTrue(instance.isCompatible(EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.Int64))); } @Test http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java index 993c943..bba0f91 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java @@ -21,12 +21,12 @@ package org.apache.olingo.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmStringTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.String.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.String); @Test public void toUriLiteral() throws Exception { http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/559698d4/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java index 8979df9..ee9b2b8 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java @@ -24,12 +24,12 @@ import java.util.Calendar; import java.util.TimeZone; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; public class EdmTimeOfDayTest extends PrimitiveTypeBaseTest { - private final EdmPrimitiveType instance = EdmPrimitiveTypeKind.TimeOfDay.getEdmPrimitiveTypeInstance(); + private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getNonGeoInstance(EdmPrimitiveTypeKind.TimeOfDay); @Test public void toUriLiteral() throws Exception {