Repository: olingo-odata4 Updated Branches: refs/heads/master dda7577fa -> f02d9a07e
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f02d9a07/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java index 5c387fc..f7a71f1 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java @@ -82,7 +82,9 @@ public abstract class AbstractEdmEntityContainer extends EdmNamedImpl implements EdmSingleton singleton = singletons.get(singletonName); if (singleton == null) { singleton = createSingleton(singletonName); - singletons.put(singletonName, singleton); + if (singleton != null) { + singletons.put(singletonName, singleton); + } } return singleton; } @@ -94,7 +96,9 @@ public abstract class AbstractEdmEntityContainer extends EdmNamedImpl implements EdmEntitySet entitySet = entitySets.get(entitySetName); if (entitySet == null) { entitySet = createEntitySet(entitySetName); - entitySets.put(entitySetName, entitySet); + if (entitySet != null) { + entitySets.put(entitySetName, entitySet); + } } return entitySet; } @@ -106,7 +110,9 @@ public abstract class AbstractEdmEntityContainer extends EdmNamedImpl implements EdmActionImport actionImport = actionImports.get(actionImportName); if (actionImport == null) { actionImport = createActionImport(actionImportName); - actionImports.put(actionImportName, actionImport); + if (actionImport != null) { + actionImports.put(actionImportName, actionImport); + } } return actionImport; } @@ -118,7 +124,9 @@ public abstract class AbstractEdmEntityContainer extends EdmNamedImpl implements EdmFunctionImport functionImport = functionImports.get(functionImportName); if (functionImport == null) { functionImport = createFunctionImport(functionImportName); - functionImports.put(functionImportName, functionImport); + if (functionImport != null) { + functionImports.put(functionImportName, functionImport); + } } return functionImport; } @@ -186,5 +194,4 @@ public abstract class AbstractEdmEntityContainer extends EdmNamedImpl implements public FullQualifiedName getAnnotationsTargetFQN() { return getFullQualifiedName(); } - } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f02d9a07/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java index 2ac876c..ed49451 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNavigationProperty.java @@ -72,6 +72,7 @@ public abstract class AbstractEdmNavigationProperty extends EdmElementImpl imple return partnerNavigationProperty; } + @Override public abstract String getReferencingPropertyName(String referencedPropertyName); @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f02d9a07/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java index 5e4f13e..3a6b3d1 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java @@ -68,8 +68,6 @@ public class EdmTypeInfo { } private final Edm edm; - private final String typeExpression; - private final boolean collection; private final FullQualifiedName fullQualifiedName; @@ -124,7 +122,6 @@ public class EdmTypeInfo { final StringBuilder exp = new StringBuilder(); exp.append(baseType); - this.typeExpression = (this.collection ? exp.insert(0, "Collection(").append(")") : exp).toString(); this.fullQualifiedName = new FullQualifiedName(namespace, typeName); try { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f02d9a07/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java index 6d9fbab..0c6a15d 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java @@ -65,8 +65,7 @@ public class EdmImplCachingTest { assertEquals(1, schemas.size()); List<EdmSchema> cachedSchemas = edm.getSchemas(); - assertTrue(schemas == cachedSchemas); - assertEquals(schemas, schemas); + assertEquals(schemas, cachedSchemas); } @Test @@ -421,7 +420,15 @@ public class EdmImplCachingTest { @Override protected Map<String, EdmSchema> createSchemas() { - return Collections.singletonMap(StringUtils.EMPTY, mock(EdmSchema.class)); + final EdmSchema schema = mock(EdmSchema.class); + when(schema.getNamespace()).thenReturn(NAME1.getNamespace()); + return new HashMap<String, EdmSchema>() { + private static final long serialVersionUID = 3109256773218160485L; + + { + put(StringUtils.EMPTY, schema); + } + }; } @Override http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f02d9a07/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java index 78651bc..a8bac25 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java @@ -19,13 +19,10 @@ package org.apache.olingo.server.core.edm.provider; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmNavigationPropertyBinding; import org.apache.olingo.commons.api.edm.Target; import org.apache.olingo.commons.core.edm.AbstractEdmBindingTarget; @@ -44,42 +41,6 @@ public abstract class EdmBindingTargetImpl extends AbstractEdmBindingTarget { } @Override - public EdmBindingTarget getRelatedBindingTarget(final String path) { - EdmBindingTarget bindingTarget = null; - - final List<NavigationPropertyBinding> navigationPropertyBindings = target.getNavigationPropertyBindings(); - if (navigationPropertyBindings != null) { - boolean found = false; - for (final Iterator<NavigationPropertyBinding> itor = navigationPropertyBindings.iterator(); itor.hasNext() - && !found;) { - - final NavigationPropertyBinding binding = itor.next(); - if (binding.getPath().equals(path)) { - final Target providerTarget = binding.getTarget(); - final EdmEntityContainer entityContainer = edm.getEntityContainer(providerTarget.getEntityContainer()); - if (entityContainer == null) { - throw new EdmException("Cant find entity container with name: " + providerTarget.getEntityContainer()); - } - final String targetName = providerTarget.getTargetName(); - bindingTarget = entityContainer.getEntitySet(targetName); - if (bindingTarget == null) { - bindingTarget = entityContainer.getSingleton(targetName); - if (bindingTarget == null) { - throw new EdmException("Cant find target with name: " + targetName); - } - - found = true; - } else { - found = true; - } - } - } - } - - return bindingTarget; - } - - @Override public List<EdmNavigationPropertyBinding> getNavigationPropertyBindings() { if (navigationPropertyBindings == null) { List<NavigationPropertyBinding> providerBindings = target.getNavigationPropertyBindings(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f02d9a07/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 18c133b..9cadeaf 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> - <version>13</version> + <version>14</version> </parent> <licenses> @@ -67,6 +67,7 @@ <commons.codec.version>1.9</commons.codec.version> <commons.io.version>2.4</commons.io.version> <commons.lang3.version>3.3.2</commons.lang3.version> + <commons.beanutils.version>1.8.3</commons.beanutils.version> <commons.logging.version>1.1.3</commons.logging.version> <commons.vfs.version>2.0</commons.vfs.version> @@ -74,6 +75,10 @@ <servlet.version>3.0.1</servlet.version> <cxf.version>2.7.11</cxf.version> <spring.version>4.0.3.RELEASE</spring.version> + + <velocity.version>1.7</velocity.version> + <maven.plugin.api.version>3.1.0</maven.plugin.api.version> + <maven.plugin.tools.version>3.2</maven.plugin.tools.version> <hc.client.version>4.2.6</hc.client.version> <jackson.version>2.3.3</jackson.version> @@ -117,6 +122,11 @@ <version>${commons.logging.version}</version> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils-core</artifactId> + <version>${commons.beanutils.version}</version> + </dependency> <dependency> <groupId>org.antlr</groupId> @@ -192,6 +202,24 @@ <artifactId>spring-web</artifactId> <version>${spring.version}</version> </dependency> + + <!-- Pojogen Maven Plugin depenencies --> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>${velocity.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven.plugin.api.version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-annotations</artifactId> + <version>${maven.plugin.tools.version}</version> + </dependency> + <!-- /Pojogen Maven Plugin depenencies --> <dependency> <groupId>junit</groupId>
