Repository: olingo-odata4 Updated Branches: refs/heads/OLINGO-564 [created] 754e23abe
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeInfo.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeInfo.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeInfo.java deleted file mode 100644 index c11e880..0000000 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeInfo.java +++ /dev/null @@ -1,228 +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.provider; - -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmEnumType; -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.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; - -public class EdmTypeInfo { - - public static class Builder { - - private String typeExpression; - private String defaultNamespace; - private Edm edm; - - public Builder setTypeExpression(final String typeExpression) { - this.typeExpression = typeExpression; - return this; - } - - public Builder setDefaultNamespace(final String defaultNamespace) { - this.defaultNamespace = defaultNamespace; - return this; - } - - public Builder setEdm(final Edm edm) { - this.edm = edm; - return this; - } - - public EdmTypeInfo build() { - return new EdmTypeInfo(edm, typeExpression.indexOf('.') == -1 && StringUtils.isNotBlank(defaultNamespace) - ? defaultNamespace + "." + typeExpression - : typeExpression); - } - } - - private final boolean collection; - private final FullQualifiedName fullQualifiedName; - private EdmPrimitiveTypeKind primitiveType; - private EdmTypeDefinition typeDefinition; - private EdmEnumType enumType; - private EdmComplexType complexType; - private EdmEntityType entityType; - - private EdmTypeInfo(final Edm edm, final String typeExpression) { - String baseType; - final int collStartIdx = typeExpression.indexOf("Collection("); - final int collEndIdx = typeExpression.lastIndexOf(')'); - if (collStartIdx == -1) { - baseType = typeExpression; - collection = false; - } else { - if (collEndIdx == -1) { - throw new IllegalArgumentException("Malformed type: " + typeExpression); - } - - collection = true; - baseType = typeExpression.substring(collStartIdx + 11, collEndIdx); - } - - baseType = baseType.replaceAll("^#", ""); - - final String typeName; - final String namespace; - - final int lastDotIdx = baseType.lastIndexOf('.'); - if (lastDotIdx == -1) { - namespace = EdmPrimitiveType.EDM_NAMESPACE; - typeName = baseType; - } else { - namespace = baseType.substring(0, lastDotIdx); - typeName = baseType.substring(lastDotIdx + 1); - } - - if (StringUtils.isBlank(typeName)) { - throw new IllegalArgumentException("Null or empty type name in " + typeExpression); - } - - fullQualifiedName = new FullQualifiedName(namespace, typeName); - - try { - primitiveType = EdmPrimitiveTypeKind.valueOf(fullQualifiedName.getName()); - } catch (final IllegalArgumentException e) { - primitiveType = null; - } - if (primitiveType == null && edm != null) { - typeDefinition = edm.getTypeDefinition(fullQualifiedName); - if (typeDefinition == null) { - enumType = edm.getEnumType(fullQualifiedName); - if (enumType == null) { - complexType = edm.getComplexType(fullQualifiedName); - if (complexType == null) { - entityType = edm.getEntityType(fullQualifiedName); - } - } - } - } - } - - public String internal() { - final StringBuilder deserialize = new StringBuilder(); - - if (isCollection()) { - deserialize.append("Collection("); - } - - deserialize.append(getFullQualifiedName().toString()); - - if (isCollection()) { - deserialize.append(")"); - } - - return deserialize.toString(); - } - - public String external() { - final StringBuilder serialize = new StringBuilder(); - - if (isCollection()) { - serialize.append('#'); - serialize.append("Collection("); - } - - if (isPrimitiveType()) { - serialize.append(getFullQualifiedName().getName()); - }else{ - serialize.append(getFullQualifiedName().toString()); - } - - if (isCollection()) { - serialize.append(")"); - } - - if (!isPrimitiveType() && !isCollection()) { - serialize.insert(0, '#'); - } - - return serialize.toString(); - } - - public boolean isCollection() { - return collection; - } - - public FullQualifiedName getFullQualifiedName() { - return fullQualifiedName; - } - - public boolean isPrimitiveType() { - return primitiveType != null; - } - - public EdmPrimitiveTypeKind getPrimitiveTypeKind() { - return primitiveType; - } - - public boolean isTypeDefinition() { - return typeDefinition != null; - } - - public EdmTypeDefinition getTypeDefinition() { - return typeDefinition; - } - - public boolean isEnumType() { - return enumType != null; - } - - public EdmEnumType getEnumType() { - return enumType; - } - - public boolean isComplexType() { - return complexType != null; - } - - public EdmComplexType getComplexType() { - return complexType; - } - - public boolean isEntityType() { - return entityType != null; - } - - public EdmEntityType getEntityType() { - return entityType; - } - - public EdmType getType() { - return isPrimitiveType() - ? EdmPrimitiveTypeFactory.getInstance(getPrimitiveTypeKind()) - : isTypeDefinition() - ? getTypeDefinition() - : isEnumType() - ? getEnumType() - : isComplexType() - ? getComplexType() - : isEntityType() - ? getEntityType() - : null; - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/Target.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/Target.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/Target.java deleted file mode 100644 index 4f45ccd..0000000 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/Target.java +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.commons.core.edm.provider; - -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.FullQualifiedName; - -/** - * An Edm target element. It contains a target as a String name as well as the {@link FullQualifiedName} of the entity - * container it is contained in. - */ -public class Target { - - private String targetName; - private FullQualifiedName entityContainer; - - public Target(String target, EdmEntityContainer defaultContainer) { - final String[] bindingTargetParts = target.split("/"); - if (bindingTargetParts.length == 1) { - entityContainer = defaultContainer.getFullQualifiedName(); - targetName = bindingTargetParts[0]; - } else { - entityContainer = new FullQualifiedName(bindingTargetParts[0]); - targetName = bindingTargetParts[1]; - } - } - - /** - * @return name of the target as a String - */ - public String getTargetName() { - return targetName; - } - - /** - * @return {@link FullQualifiedName} of the entity container this target is contained in. - */ - public FullQualifiedName getEntityContainer() { - return entityContainer; - } - - @Override - public String toString() { - if (entityContainer == null) { - return targetName; - } - return entityContainer.getFullQualifiedNameAsString() + "/" + targetName; - } - -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java index 84795bf..26cafc2 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java @@ -60,7 +60,7 @@ import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.serialization.ODataDeserializer; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.aalto.stax.InputFactoryImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java index fb187fe..7543eac 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java @@ -49,7 +49,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.serialization.ODataSerializer; import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.aalto.stax.OutputFactoryImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java index 34394bb..c9c715a 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java @@ -52,7 +52,7 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.serialization.ODataDeserializer; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParser; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java index bf54cda..703f6b6 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java @@ -38,7 +38,7 @@ import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.ODataLinkType; import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java index b0fce7c..b6a32ef 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java @@ -30,7 +30,7 @@ import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.jackson.core.JsonGenerator; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java index 355f321..33629f4 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java @@ -37,7 +37,7 @@ import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; import org.apache.olingo.commons.api.edm.geo.SRID; import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.jackson.databind.JsonNode; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java index 47c4387..885ba30 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java @@ -30,7 +30,7 @@ import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.data.ValueType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java index 870cabd..d531108 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.data.Annotation; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.jackson.core.JsonGenerator; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java index 0dd8dd4..84ed5f7 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java @@ -48,7 +48,7 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataSerializer; import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.edm.provider.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java index c659a8a..ad8cbc4 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ServiceMetadataImpl.java @@ -21,7 +21,7 @@ package org.apache.olingo.server.core; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.ServiceMetadata; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java index 04f0556..efc75b7 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/AbstractEdmNamedTest.java @@ -22,7 +22,7 @@ import org.apache.olingo.commons.api.edm.EdmAnnotatable; import org.apache.olingo.commons.api.edm.EdmNamed; import org.apache.olingo.commons.api.edm.provider.Annotatable; import org.apache.olingo.commons.api.edm.provider.Annotation; -import org.apache.olingo.commons.core.edm.provider.AbstractEdmNamed; +import org.apache.olingo.commons.core.edm.AbstractEdmNamed; import org.junit.Test; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java index 8a3dc87..a33fc6e 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java @@ -40,8 +40,8 @@ import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.provider.Action; import org.apache.olingo.commons.api.edm.provider.Parameter; import org.apache.olingo.commons.api.edm.provider.ReturnType; -import org.apache.olingo.commons.core.edm.provider.EdmActionImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmActionImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java index 950112f..a5d098d 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java @@ -31,8 +31,8 @@ import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.ActionImport; -import org.apache.olingo.commons.core.edm.provider.EdmActionImportImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmActionImportImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java index 917f60b..87a7723 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java @@ -27,8 +27,8 @@ import org.apache.olingo.commons.api.edm.provider.ComplexType; import org.apache.olingo.commons.api.edm.provider.EdmProvider; import org.apache.olingo.commons.api.edm.provider.NavigationProperty; import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.core.edm.provider.EdmComplexTypeImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmComplexTypeImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java index 312d636..52713a3 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java @@ -45,8 +45,8 @@ import org.apache.olingo.commons.api.edm.provider.EntityContainerInfo; import org.apache.olingo.commons.api.edm.provider.EntitySet; import org.apache.olingo.commons.api.edm.provider.FunctionImport; import org.apache.olingo.commons.api.edm.provider.Singleton; -import org.apache.olingo.commons.core.edm.provider.EdmEntityContainerImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmEntityContainerImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java index 4e9dad0..0071ddd 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java @@ -36,9 +36,9 @@ import org.apache.olingo.commons.api.edm.provider.EntitySet; import org.apache.olingo.commons.api.edm.provider.EntityType; import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding; import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.core.edm.provider.EdmEntityContainerImpl; -import org.apache.olingo.commons.core.edm.provider.EdmEntitySetImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmEntityContainerImpl; +import org.apache.olingo.commons.core.edm.EdmEntitySetImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; public class EdmEntitySetImplTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java index 045c1a7..8c39ac6 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java @@ -43,8 +43,8 @@ import org.apache.olingo.commons.api.edm.provider.EntityType; import org.apache.olingo.commons.api.edm.provider.NavigationProperty; import org.apache.olingo.commons.api.edm.provider.Property; import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.core.edm.provider.EdmEntityTypeImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmEntityTypeImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java index 0767f65..edc9a21 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java @@ -29,8 +29,8 @@ import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.provider.EnumMember; import org.apache.olingo.commons.api.edm.provider.EnumType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.edm.provider.EdmEnumTypeImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmEnumTypeImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; import org.mockito.Mockito; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java index a58ee2b..8adab01 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java @@ -24,8 +24,8 @@ import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.Function; import org.apache.olingo.commons.api.edm.provider.ReturnType; -import org.apache.olingo.commons.core.edm.provider.EdmFunctionImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmFunctionImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java index 6180dfa..002ec05 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java @@ -30,9 +30,9 @@ import org.apache.olingo.commons.api.edm.provider.FunctionImport; import org.apache.olingo.commons.api.edm.provider.Parameter; import org.apache.olingo.commons.api.edm.provider.ReturnType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.edm.provider.EdmEntityContainerImpl; -import org.apache.olingo.commons.core.edm.provider.EdmFunctionImportImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmEntityContainerImpl; +import org.apache.olingo.commons.core.edm.EdmFunctionImportImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java index f11865b..d4e957a 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java @@ -25,7 +25,7 @@ import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.core.edm.provider.EdmKeyPropertyRefImpl; +import org.apache.olingo.commons.core.edm.EdmKeyPropertyRefImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java index bae57ef..5730d40 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMappingTest.java @@ -31,8 +31,8 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.Mapping; import org.apache.olingo.commons.api.edm.provider.Parameter; import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.core.edm.provider.EdmParameterImpl; -import org.apache.olingo.commons.core.edm.provider.EdmPropertyImpl; +import org.apache.olingo.commons.core.edm.EdmParameterImpl; +import org.apache.olingo.commons.core.edm.EdmPropertyImpl; import org.junit.Test; public class EdmMappingTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java index 01d7c39..a0c2944 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java @@ -19,8 +19,8 @@ package org.apache.olingo.server.core.edm.provider; import org.apache.olingo.commons.api.edm.provider.EnumMember; -import org.apache.olingo.commons.core.edm.provider.EdmMemberImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmMemberImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java index 9a275ff..4751f59 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java @@ -28,8 +28,8 @@ import org.apache.olingo.commons.api.edm.provider.EntityType; import org.apache.olingo.commons.api.edm.provider.NavigationProperty; import org.apache.olingo.commons.api.edm.provider.PropertyRef; import org.apache.olingo.commons.api.edm.provider.ReferentialConstraint; -import org.apache.olingo.commons.core.edm.provider.EdmNavigationPropertyImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmNavigationPropertyImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java index dab89a6..bbcea0b 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java @@ -30,8 +30,8 @@ import org.apache.olingo.commons.api.edm.provider.EdmProvider; import org.apache.olingo.commons.api.edm.provider.EnumType; import org.apache.olingo.commons.api.edm.provider.Parameter; import org.apache.olingo.commons.api.edm.provider.TypeDefinition; -import org.apache.olingo.commons.core.edm.provider.EdmParameterImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmParameterImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java index d9e73f9..cc3e819 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java @@ -30,8 +30,8 @@ import org.apache.olingo.commons.api.edm.provider.EdmProvider; import org.apache.olingo.commons.api.edm.provider.EnumType; import org.apache.olingo.commons.api.edm.provider.Property; import org.apache.olingo.commons.api.edm.provider.TypeDefinition; -import org.apache.olingo.commons.core.edm.provider.EdmPropertyImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmPropertyImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java index 9e9f993..f7fb6c5 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java @@ -27,7 +27,7 @@ import org.apache.olingo.commons.api.edm.provider.Action; import org.apache.olingo.commons.api.edm.provider.EdmProvider; import org.apache.olingo.commons.api.edm.provider.Function; import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java index f629f19..aa98ad8 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java @@ -35,7 +35,7 @@ import org.apache.olingo.commons.api.edm.provider.EntityType; import org.apache.olingo.commons.api.edm.provider.EnumType; import org.apache.olingo.commons.api.edm.provider.PropertyRef; import org.apache.olingo.commons.api.edm.provider.TypeDefinition; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java index a7168ae..e8cecee 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java @@ -29,8 +29,8 @@ import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.provider.ReturnType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.commons.core.edm.provider.EdmReturnTypeImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmReturnTypeImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java index 9e0b44e..9b08277 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java @@ -60,7 +60,7 @@ import org.apache.olingo.commons.api.edm.provider.Schema; import org.apache.olingo.commons.api.edm.provider.Singleton; import org.apache.olingo.commons.api.edm.provider.Term; import org.apache.olingo.commons.api.edm.provider.TypeDefinition; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java index c80daa1..f502e20 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java @@ -37,9 +37,9 @@ import org.apache.olingo.commons.api.edm.provider.EntityType; import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding; import org.apache.olingo.commons.api.edm.provider.PropertyRef; import org.apache.olingo.commons.api.edm.provider.Singleton; -import org.apache.olingo.commons.core.edm.provider.EdmEntityContainerImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.commons.core.edm.provider.EdmSingletonImpl; +import org.apache.olingo.commons.core.edm.EdmEntityContainerImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmSingletonImpl; import org.junit.Test; public class EdmSingletonImplTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java index ac32302..845dea7 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java @@ -25,8 +25,8 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.provider.TypeDefinition; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.commons.core.edm.provider.EdmTypeDefinitionImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmTypeDefinitionImpl; import org.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java index b9f6db6..5249de7 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java @@ -24,7 +24,7 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.provider.Annotatable; import org.apache.olingo.commons.api.edm.provider.Annotation; -import org.apache.olingo.commons.core.edm.provider.EdmTypeImpl; +import org.apache.olingo.commons.core.edm.EdmTypeImpl; import org.junit.Test; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ComplexTypeHelper.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ComplexTypeHelper.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ComplexTypeHelper.java index 7979159..4333308 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ComplexTypeHelper.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ComplexTypeHelper.java @@ -32,8 +32,8 @@ import org.apache.olingo.commons.api.edm.provider.ComplexType; import org.apache.olingo.commons.api.edm.provider.EdmProvider; import org.apache.olingo.commons.api.edm.provider.NavigationProperty; import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.core.edm.provider.EdmComplexTypeImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmComplexTypeImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; public class ComplexTypeHelper { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java index e9e21ab..af5b421 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/utils/ContextURLBuilderTest.java @@ -38,8 +38,8 @@ import org.apache.olingo.commons.api.edm.provider.EdmProvider; import org.apache.olingo.commons.api.edm.provider.NavigationProperty; import org.apache.olingo.commons.api.edm.provider.Property; import org.apache.olingo.commons.core.edm.primitivetype.EdmString; -import org.apache.olingo.commons.core.edm.provider.EdmComplexTypeImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmComplexTypeImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.junit.Test; import org.mockito.Mockito; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java index a7bd86e..d1b73f7 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializerTest.java @@ -58,7 +58,7 @@ import org.apache.olingo.commons.api.edm.provider.ReturnType; import org.apache.olingo.commons.api.edm.provider.Schema; import org.apache.olingo.commons.api.edm.provider.Singleton; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.commons.core.edm.provider.EdmComplexTypeImpl; +import org.apache.olingo.commons.core.edm.EdmComplexTypeImpl; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReference; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java index 40cea2e..a13b929 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java @@ -21,7 +21,7 @@ package org.apache.olingo.server.core.uri; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.uri.UriInfoAll; import org.apache.olingo.server.api.uri.UriInfoBatch; import org.apache.olingo.server.api.uri.UriInfoCrossjoin; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java index a6d9792..050cce1 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java @@ -29,10 +29,10 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import org.apache.olingo.commons.core.edm.provider.EdmComplexTypeImpl; -import org.apache.olingo.commons.core.edm.provider.EdmEntitySetImpl; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.commons.core.edm.provider.EdmSingletonImpl; +import org.apache.olingo.commons.core.edm.EdmComplexTypeImpl; +import org.apache.olingo.commons.core.edm.EdmEntitySetImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmSingletonImpl; import org.apache.olingo.server.api.uri.UriResourceKind; import org.apache.olingo.server.core.uri.queryoption.expression.ExpressionImpl; import org.apache.olingo.server.core.uri.queryoption.expression.LiteralImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java index 88cd44e..3658960 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java @@ -24,7 +24,7 @@ import java.util.Arrays; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.http.HttpContentType; import org.apache.olingo.commons.core.Encoder; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriResourceKind; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java index 86cbf0e..e92dcbe 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java @@ -24,7 +24,7 @@ import java.util.Arrays; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriResourceKind; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java index 6f728be..3c9246a 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java @@ -20,7 +20,7 @@ package org.apache.olingo.server.core.uri.queryoption; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; import org.apache.olingo.server.core.uri.UriInfoImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java index 6bdd494..e8f2756 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java @@ -23,7 +23,7 @@ import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriInfoResource; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ac32d236/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java index db3930e..f04d81c 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.fail; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.EdmProviderImpl; import org.apache.olingo.server.api.uri.UriInfo; import org.apache.olingo.server.core.uri.parser.Parser; import org.apache.olingo.server.core.uri.parser.UriParserException;
