Repository: olingo-odata4 Updated Branches: refs/heads/master 36219d325 -> 5cef4faeb
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java deleted file mode 100644 index 1ea0058..0000000 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java +++ /dev/null @@ -1,50 +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.server.core.edm.provider; - -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmAnnotation; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmSingleton; -import org.apache.olingo.commons.api.edm.EdmTerm; -import org.apache.olingo.commons.api.edm.provider.Singleton; - -import java.util.List; - -public class EdmSingletonImpl extends EdmBindingTargetImpl implements EdmSingleton { - - public EdmSingletonImpl(final Edm edm, final EdmEntityContainer container, final Singleton singleton) { - super(edm, container, singleton); - } - - @Override - public TargetType getAnnotationsTargetType() { - return TargetType.Singleton; - } - - @Override - public EdmAnnotation getAnnotation(final EdmTerm term) { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public List<EdmAnnotation> getAnnotations() { - throw new UnsupportedOperationException("Not supported yet."); - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java deleted file mode 100644 index d672838..0000000 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java +++ /dev/null @@ -1,89 +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.server.core.edm.provider; - -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmNavigationProperty; -import org.apache.olingo.commons.api.edm.EdmProperty; -import org.apache.olingo.commons.api.edm.FullQualifiedName; -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.StructuralType; -import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; - -import java.util.LinkedHashMap; -import java.util.Map; - -public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper { - - private final Edm edm; - - private final FullQualifiedName structuredTypeName; - - private final StructuralType structuredType; - - private Map<String, EdmProperty> properties; - - private Map<String, EdmNavigationProperty> navigationProperties; - - public EdmStructuredTypeHelperImpl( - final Edm edm, final FullQualifiedName structuredTypeName, final StructuralType structuredType) { - - this.edm = edm; - this.structuredTypeName = structuredTypeName; - this.structuredType = structuredType; - } - - @Override - public Map<String, EdmProperty> getProperties() { - if (properties == null) { - properties = new LinkedHashMap<String, EdmProperty>(); - if (structuredType.getProperties() != null) { - for (Property property : structuredType.getProperties()) { - properties.put(property.getName(), new EdmPropertyImpl(edm, structuredTypeName, property)); - } - } - } - return properties; - } - - @Override - public Map<String, EdmNavigationProperty> getNavigationProperties() { - if (navigationProperties == null) { - navigationProperties = new LinkedHashMap<String, EdmNavigationProperty>(); - if (structuredType.getNavigationProperties() != null) { - for (NavigationProperty navigationProperty : structuredType.getNavigationProperties()) { - navigationProperties.put(navigationProperty.getName(), - new EdmNavigationPropertyImpl(edm, structuredTypeName, navigationProperty)); - } - } - } - return navigationProperties; - } - - @Override - public boolean isOpenType() { - return structuredType.isOpenType(); - } - - @Override - public boolean isAbstract() { - return structuredType.isAbstract(); - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java deleted file mode 100644 index 95849b4..0000000 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.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.server.core.edm.provider; - -import java.util.List; - -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmAnnotation; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.api.edm.EdmTerm; -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; -import org.apache.olingo.commons.core.edm.AbstractEdmTypeDefinition; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; - -public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition { - - private TypeDefinition typeDefinition; - - private EdmPrimitiveType edmPrimitiveTypeInstance; - - public EdmTypeDefinitionImpl(final Edm edm, final FullQualifiedName typeDefinitionName, - final TypeDefinition typeDefinition) { - - super(edm, typeDefinitionName); - this.typeDefinition = typeDefinition; - } - - @Override - public EdmPrimitiveType getUnderlyingType() { - if (edmPrimitiveTypeInstance == null) { - try { - edmPrimitiveTypeInstance = EdmPrimitiveTypeFactory.getInstance( - EdmPrimitiveTypeKind.valueOfFQN(typeDefinition.getUnderlyingType())); - } catch (IllegalArgumentException e) { - throw new EdmException("Invalid underlying type: " + typeDefinition.getUnderlyingType(), e); - } - } - return edmPrimitiveTypeInstance; - } - - @Override - public Integer getMaxLength() { - return typeDefinition.getMaxLength(); - } - - @Override - public Integer getPrecision() { - return typeDefinition.getPrecision(); - } - - @Override - public Integer getScale() { - return typeDefinition.getScale(); - } - - @Override - public SRID getSrid() { - return null; // TODO: provide implementation - } - - @Override - public Boolean isUnicode() { - return typeDefinition.isUnicode(); - } - - @Override - public EdmAnnotation getAnnotation(final EdmTerm term) { - throw new UnsupportedOperationException("Not supported yet."); - } - - @Override - public List<EdmAnnotation> getAnnotations() { - throw new UnsupportedOperationException("Not supported yet."); - } -} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 f3c849b..ca91ad0 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,6 +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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 8f1ce78..e4ad2dd 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 @@ -26,6 +26,8 @@ import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.Target; 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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 ea91594..a02e356 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,6 +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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 8a7bf22..33f8b64 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 @@ -33,6 +33,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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 52effee..95de14e 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 @@ -30,6 +30,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.junit.Test; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 360f9d1..e6ddf40 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,6 +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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 3334a86..401cf90 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 @@ -27,6 +27,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.junit.Test; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 ca014ce..3a553b3 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,6 +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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 4f1c333..6180dfa 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,6 +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.junit.Test; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 0515e1d..f11865b 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,6 +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.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 aaaeef0..bae57ef 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,6 +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.junit.Test; public class EdmMappingTest { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 a1a0490..01d7c39 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,6 +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.junit.Test; import static org.junit.Assert.assertEquals; @@ -29,8 +31,7 @@ public class EdmMemberImplTest { @Test public void enumMember() { final EnumMember member = new EnumMember().setName("name").setValue("value"); - final EdmMemberImpl memberImpl = - new EdmMemberImpl(mock(EdmProviderImpl.class), null, member.getName(), member.getValue()); + final EdmMemberImpl memberImpl = new EdmMemberImpl(mock(EdmProviderImpl.class), null, member); assertEquals("name", memberImpl.getName()); assertEquals("value", memberImpl.getValue()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 bb3b264..9a275ff 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,6 +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.junit.Test; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 c5d003c..dab89a6 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,6 +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.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 5d9758c..d9e73f9 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,6 +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.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 74ba467..9e9f993 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,6 +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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 f262ad6..f629f19 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,6 +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.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 461174a..a7168ae 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,6 +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.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 354e982..465dca3 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 @@ -29,6 +29,7 @@ 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.api.edm.EdmFunctionImport; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmSchema; import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; @@ -49,6 +50,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.junit.Before; import org.junit.Test; @@ -314,8 +316,10 @@ public class EdmSchemaImplTest { providerSchema.setEntityContainer(container); List<TypeDefinition> typeDefinitions = new ArrayList<TypeDefinition>(); - typeDefinitions.add(new TypeDefinition().setName("typeDefinition1")); - typeDefinitions.add(new TypeDefinition().setName("typeDefinition2")); + typeDefinitions.add(new TypeDefinition().setName("typeDefinition1").setUnderlyingType( + EdmPrimitiveTypeKind.String.getFullQualifiedName())); + typeDefinitions.add(new TypeDefinition().setName("typeDefinition2").setUnderlyingType( + EdmPrimitiveTypeKind.String.getFullQualifiedName())); providerSchema.setTypeDefinitions(typeDefinitions); List<EnumType> enumTypes = new ArrayList<EnumType>(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 d8e3975..9816a81 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 @@ -31,6 +31,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.junit.Test; import java.util.Arrays; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 4342afc..ac32302 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,6 +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.junit.Test; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 1b16d4b..a2481e1 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.server.core.edm.provider.EdmComplexTypeImpl; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.provider.EdmComplexTypeImpl; +import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; public class ComplexTypeHelper { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 2017359..1112c8f 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.server.core.edm.provider.EdmComplexTypeImpl; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.commons.core.edm.provider.EdmComplexTypeImpl; +import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; import org.junit.Test; import org.mockito.Mockito; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 13a662a..47a9136 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 @@ -57,6 +57,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.server.api.OData; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReference; @@ -65,7 +66,6 @@ import org.apache.olingo.server.api.edmx.EdmxReferenceIncludeAnnotation; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.core.ServiceMetadataImpl; -import org.apache.olingo.server.core.edm.provider.EdmComplexTypeImpl; import org.junit.BeforeClass; import org.junit.Test; @@ -216,7 +216,6 @@ public class MetadataDocumentXmlSerializerTest { InputStream metadataStream = serializer.metadataDocument(serviceMetadata); String metadata = IOUtils.toString(metadataStream); assertNotNull(metadata); - System.out.println(metadata); assertTrue(metadata.contains("<EnumType Name=\"ENString\" IsFlags=\"true\" UnderlyingType=\"Edm.Int16\">")); assertTrue(metadata.contains("<EntityType Name=\"ETAbstractBase\" BaseType=\"Alias.ETAbstract\">")); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 d4e8ebd..40cea2e 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,6 +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.server.api.uri.UriInfoAll; import org.apache.olingo.server.api.uri.UriInfoBatch; import org.apache.olingo.server.api.uri.UriInfoCrossjoin; @@ -30,7 +31,6 @@ import org.apache.olingo.server.api.uri.UriInfoMetadata; import org.apache.olingo.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.UriInfoService; import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.core.uri.queryoption.CountOptionImpl; import org.apache.olingo.server.core.uri.queryoption.CustomQueryOptionImpl; import org.apache.olingo.server.core.uri.queryoption.ExpandOptionImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 65c1697..6c72a0f 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,11 +29,11 @@ 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.server.api.uri.UriResourceKind; -import org.apache.olingo.server.core.edm.provider.EdmComplexTypeImpl; -import org.apache.olingo.server.core.edm.provider.EdmEntitySetImpl; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; -import org.apache.olingo.server.core.edm.provider.EdmSingletonImpl; import org.apache.olingo.server.core.uri.queryoption.expression.ExpressionImpl; import org.apache.olingo.server.core.uri.queryoption.expression.LiteralImpl; import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 a774df6..39d55e7 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,13 +24,13 @@ 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.server.api.ODataApplicationException; 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.BinaryOperatorKind; import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.core.uri.parser.UriParserException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException; import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 8d50512..16c919b 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,10 +24,10 @@ 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.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriResourceKind; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.core.uri.parser.UriParserException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException; import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 cde718f..bd7e9ee 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,9 +20,9 @@ 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.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.core.uri.UriInfoImpl; import org.apache.olingo.server.core.uri.queryoption.expression.AliasImpl; import org.apache.olingo.server.core.uri.queryoption.expression.ExpressionImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 db16728..6bdd494 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,6 +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.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.UriInfoKind; import org.apache.olingo.server.api.uri.UriInfoResource; @@ -30,7 +31,6 @@ import org.apache.olingo.server.api.uri.queryoption.expression.BinaryOperatorKin import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.core.uri.UriInfoImpl; import org.apache.olingo.server.core.uri.UriResourceActionImpl; import org.apache.olingo.server.core.uri.UriResourceFunctionImpl; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/5cef4fae/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 14fdcf1..1835bef 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 @@ -20,8 +20,8 @@ package org.apache.olingo.server.core.uri.validator; 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.server.api.uri.UriInfo; -import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.core.uri.parser.Parser; import org.apache.olingo.server.core.uri.parser.UriParserException; import org.apache.olingo.server.core.uri.parser.UriParserSemanticException;
