You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/03/12 13:49:34 UTC
[4/5] git commit: Some client-side refinements,
generally Edm enhancements look fine
Some client-side refinements, generally Edm enhancements look fine
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/950e90cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/950e90cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/950e90cb
Branch: refs/heads/master
Commit: 950e90cbfc160c7b2f5849f9a688eda6e32b3d46
Parents: 44aadbd
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Wed Mar 12 11:24:50 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Wed Mar 12 11:24:50 2014 +0100
----------------------------------------------------------------------
.../olingo/client/api/edm/xml/v4/Parameter.java | 3 -
.../olingo/client/core/edm/EdmClientImpl.java | 4 +-
.../client/core/edm/EdmEntityContainerImpl.java | 58 ++++++++++----------
.../client/core/edm/EdmFunctionImportImpl.java | 6 +-
.../client/core/edm/EdmOperationImpl.java | 28 +++++++---
.../olingo/client/core/edm/EdmSchemaImpl.java | 45 ++++++++-------
.../core/edm/v3/EdmFunctionImportProxy.java | 1 -
.../client/core/edm/xml/v4/ParameterImpl.java | 12 ----
.../commons/api/edm/EdmFunctionImport.java | 20 +++----
9 files changed, 87 insertions(+), 90 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Parameter.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Parameter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Parameter.java
index 7c1d331..0b8b975 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Parameter.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Parameter.java
@@ -21,7 +21,4 @@ package org.apache.olingo.client.api.edm.xml.v4;
public interface Parameter extends org.apache.olingo.client.api.edm.xml.CommonParameter {
String getSrid();
-
- //TODO: Has this to be moved into CommonParameter?
- boolean isCollection();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
index 62f7d36..5baeea6 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java
@@ -373,8 +373,8 @@ public class EdmClientImpl extends AbstractEdmImpl {
@Override
protected List<EdmSchema> createSchemas() {
- List<EdmSchema> schemas = new ArrayList<EdmSchema>();
- for(Schema schema : xmlMetadata.getSchemas()){
+ final List<EdmSchema> schemas = new ArrayList<EdmSchema>();
+ for (Schema schema : xmlMetadata.getSchemas()) {
schemas.add(new EdmSchemaImpl(this, xmlMetadata, schema));
}
return schemas;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java
index eeccd95..e039954 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java
@@ -48,7 +48,7 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
private final XMLMetadata xmlMetadata;
public EdmEntityContainerImpl(final Edm edm, final FullQualifiedName entityContainerName,
- final EntityContainer xmlEntityContainer, final XMLMetadata xmlMetadata) {
+ final EntityContainer xmlEntityContainer, final XMLMetadata xmlMetadata) {
super(edm, entityContainerName);
@@ -63,13 +63,13 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
}
final Singleton singleton = ((org.apache.olingo.client.api.edm.xml.v4.EntityContainer) xmlEntityContainer).
- getSingleton(singletonName);
+ getSingleton(singletonName);
if (singleton == null) {
throw new EdmException("Singleton named '" + singletonName + "' not found in " + entityContainerName);
}
return new EdmSingletonImpl(edm, this, singletonName,
- new EdmTypeInfo(singleton.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
- singleton);
+ new EdmTypeInfo(singleton.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
+ singleton);
}
@Override
@@ -81,12 +81,12 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
if (entitySet instanceof org.apache.olingo.client.api.edm.xml.v4.EntitySet) {
return new EdmEntitySetImpl(edm, this, entitySetName,
- new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
- (org.apache.olingo.client.api.edm.xml.v4.EntitySet) entitySet);
+ new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
+ (org.apache.olingo.client.api.edm.xml.v4.EntitySet) entitySet);
} else {
return new EdmEntitySetProxy(edm, this, entitySetName,
- new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
- xmlMetadata);
+ new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
+ xmlMetadata);
}
}
@@ -94,7 +94,7 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
protected EdmActionImport createActionImport(final String actionImportName) {
if (xmlEntityContainer instanceof org.apache.olingo.client.api.edm.xml.v4.EntityContainer) {
final ActionImport actionImport = ((org.apache.olingo.client.api.edm.xml.v4.EntityContainer) xmlEntityContainer).
- getActionImport(actionImportName);
+ getActionImport(actionImportName);
if (actionImport == null) {
throw new EdmException("ActionImport named '" + actionImportName + "' not found in " + entityContainerName);
}
@@ -117,10 +117,10 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
if (functionImport instanceof org.apache.olingo.client.api.edm.xml.v4.FunctionImport) {
return new EdmFunctionImportImpl(edm, this, functionImportName,
- (org.apache.olingo.client.api.edm.xml.v4.FunctionImport) functionImport);
+ (org.apache.olingo.client.api.edm.xml.v4.FunctionImport) functionImport);
} else {
return new EdmFunctionImportProxy(edm, this, functionImportName,
- (org.apache.olingo.client.api.edm.xml.v3.FunctionImport) functionImport);
+ (org.apache.olingo.client.api.edm.xml.v3.FunctionImport) functionImport);
}
}
@@ -132,12 +132,12 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
EdmEntitySet edmSet;
if (entitySet instanceof org.apache.olingo.client.api.edm.xml.v4.EntitySet) {
edmSet = new EdmEntitySetImpl(edm, this, entitySet.getName(),
- new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
- (org.apache.olingo.client.api.edm.xml.v4.EntitySet) entitySet);
+ new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
+ (org.apache.olingo.client.api.edm.xml.v4.EntitySet) entitySet);
} else {
edmSet = new EdmEntitySetProxy(edm, this, entitySet.getName(),
- new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
- xmlMetadata);
+ new EdmTypeInfo(entitySet.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
+ xmlMetadata);
}
entitySets.put(edmSet.getName(), edmSet);
}
@@ -147,16 +147,16 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
@Override
protected void loadAllFunctionImports() {
- List<? extends CommonFunctionImport> localFunctionImports = xmlEntityContainer.getFunctionImports();
+ final List<? extends CommonFunctionImport> localFunctionImports = xmlEntityContainer.getFunctionImports();
if (localFunctionImports != null) {
for (CommonFunctionImport functionImport : localFunctionImports) {
EdmFunctionImport edmFunctionImport;
if (functionImport instanceof org.apache.olingo.client.api.edm.xml.v4.FunctionImport) {
edmFunctionImport = new EdmFunctionImportImpl(edm, this, functionImport.getName(),
- (org.apache.olingo.client.api.edm.xml.v4.FunctionImport) functionImport);
+ (org.apache.olingo.client.api.edm.xml.v4.FunctionImport) functionImport);
} else {
edmFunctionImport = new EdmFunctionImportProxy(edm, this, functionImport.getName(),
- (org.apache.olingo.client.api.edm.xml.v3.FunctionImport) functionImport);
+ (org.apache.olingo.client.api.edm.xml.v3.FunctionImport) functionImport);
}
functionImports.put(edmFunctionImport.getName(), edmFunctionImport);
}
@@ -169,13 +169,13 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
throw new UnsupportedInV3Exception();
}
- List<Singleton> localSingletons =
- ((org.apache.olingo.client.api.edm.xml.v4.EntityContainer) xmlEntityContainer).getSingletons();
+ final List<Singleton> localSingletons =
+ ((org.apache.olingo.client.api.edm.xml.v4.EntityContainer) xmlEntityContainer).getSingletons();
if (localSingletons != null) {
for (Singleton singleton : localSingletons) {
singletons.put(singleton.getName(), new EdmSingletonImpl(edm, this, singleton.getName(),
- new EdmTypeInfo(singleton.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
- singleton));
+ new EdmTypeInfo(singleton.getEntityType(), entityContainerName.getNamespace()).getFullQualifiedName(),
+ singleton));
}
}
}
@@ -183,21 +183,21 @@ public class EdmEntityContainerImpl extends AbstractEdmEntityContainer {
@Override
protected void loadAllActionImports() {
if (xmlEntityContainer instanceof org.apache.olingo.client.api.edm.xml.v4.EntityContainer) {
- List<ActionImport> localActionImports =
- ((org.apache.olingo.client.api.edm.xml.v4.EntityContainer) xmlEntityContainer).getActionImports();
+ final List<ActionImport> localActionImports =
+ ((org.apache.olingo.client.api.edm.xml.v4.EntityContainer) xmlEntityContainer).getActionImports();
if (actionImports != null) {
for (ActionImport actionImport : localActionImports) {
- actionImports.put(actionImport.getName(), new EdmActionImportImpl(edm, this, actionImport.getName(),
- actionImport));
+ actionImports.put(actionImport.getName(),
+ new EdmActionImportImpl(edm, this, actionImport.getName(), actionImport));
}
}
} else {
@SuppressWarnings("unchecked")
- List<FunctionImport> localFunctionImports = (List<FunctionImport>) xmlEntityContainer.getFunctionImports();
+ final List<FunctionImport> localFunctionImports = (List<FunctionImport>) xmlEntityContainer.getFunctionImports();
if (localFunctionImports != null) {
for (FunctionImport functionImport : localFunctionImports) {
- actionImports.put(functionImport.getName(), new EdmActionImportProxy(edm, this, functionImport.getName(),
- functionImport));
+ actionImports.put(functionImport.getName(),
+ new EdmActionImportProxy(edm, this, functionImport.getName(), functionImport));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java
index edc1861..ce5f6de 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java
@@ -33,7 +33,7 @@ public class EdmFunctionImportImpl extends EdmOperationImportImpl implements Edm
private final FunctionImport functionImport;
public EdmFunctionImportImpl(final Edm edm, final EdmEntityContainer container, final String name,
- final FunctionImport functionImport) {
+ final FunctionImport functionImport) {
super(edm, container, name, functionImport.getEntitySet());
this.functionImport = functionImport;
@@ -42,8 +42,8 @@ public class EdmFunctionImportImpl extends EdmOperationImportImpl implements Edm
@Override
public EdmFunction getFunction(final List<String> parameterNames) {
return edm.getFunction(
- new EdmTypeInfo(functionImport.getFunction(), container.getNamespace()).getFullQualifiedName(),
- null, null, parameterNames);
+ new EdmTypeInfo(functionImport.getFunction(), container.getNamespace()).getFullQualifiedName(),
+ null, null, parameterNames);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java
index 667dafe..f54d6c1 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java
@@ -22,7 +22,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.CommonParameter;
-import org.apache.olingo.client.api.edm.xml.v4.Parameter;
import org.apache.olingo.client.api.edm.xml.v4.Action;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmParameter;
@@ -59,21 +58,32 @@ public abstract class EdmOperationImpl extends AbstractEdmOperation {
super(edm, name, kind);
this.operation = operation;
}
-
+
+ private EdmParameter getBindingParameter() {
+ EdmParameter bindingParam = null;
+ if (isBound()) {
+ final String bindingParamName = operation.getParameters().get(0).getName();
+ bindingParam = getParameter(bindingParamName);
+ }
+ return bindingParam;
+ }
+
@Override
public FullQualifiedName getBindingParameterTypeFqn() {
- if (isBound()) {
- Parameter bindingParameter = operation.getParameters().get(0);
- return new FullQualifiedName(getNamespace(), bindingParameter.getName());
+ FullQualifiedName fqn = null;
+ final EdmParameter bindingParam = getBindingParameter();
+ if (bindingParam != null) {
+ fqn = new FullQualifiedName(bindingParam.getType().getNamespace(), bindingParam.getType().getName());
}
- return null;
+ return fqn;
}
@Override
public Boolean isBindingParameterTypeCollection() {
- if (isBound()) {
- Parameter bindingParameter = operation.getParameters().get(0);
- return bindingParameter.isCollection();
+ Boolean result = null;
+ final EdmParameter bindingParam = getBindingParameter();
+ if (bindingParam != null) {
+ result = bindingParam.isCollection();
}
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
index 40f31b7..58c9496 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java
@@ -46,7 +46,9 @@ import org.apache.olingo.commons.core.edm.AbstractEdmSchemaImpl;
public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
private final Edm edm;
+
private final XMLMetadata xmlMetadata;
+
private final Schema schema;
public EdmSchemaImpl(Edm edm, XMLMetadata xmlMetadata, Schema schema) {
@@ -58,9 +60,10 @@ public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
@Override
protected EdmEntityContainer createEntityContainer() {
- EntityContainer defaultContainer = schema.getDefaultEntityContainer();
+ final EntityContainer defaultContainer = schema.getDefaultEntityContainer();
if (defaultContainer != null) {
- FullQualifiedName entityContainerName = new FullQualifiedName(schema.getNamespace(), defaultContainer.getName());
+ final FullQualifiedName entityContainerName =
+ new FullQualifiedName(schema.getNamespace(), defaultContainer.getName());
return new EdmEntityContainerImpl(edm, entityContainerName, defaultContainer, xmlMetadata);
}
return null;
@@ -68,10 +71,10 @@ public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
@Override
protected List<EdmTypeDefinition> createTypeDefinitions() {
- List<EdmTypeDefinition> typeDefinitions = new ArrayList<EdmTypeDefinition>();
+ final List<EdmTypeDefinition> typeDefinitions = new ArrayList<EdmTypeDefinition>();
if (schema instanceof org.apache.olingo.client.api.edm.xml.v4.Schema) {
- List<TypeDefinition> providerTypeDefinitions =
- ((org.apache.olingo.client.api.edm.xml.v4.Schema) schema).getTypeDefinitions();
+ final List<TypeDefinition> providerTypeDefinitions =
+ ((org.apache.olingo.client.api.edm.xml.v4.Schema) schema).getTypeDefinitions();
if (providerTypeDefinitions != null) {
for (TypeDefinition def : providerTypeDefinitions) {
typeDefinitions.add(new EdmTypeDefinitionImpl(edm, new FullQualifiedName("namespace", def.getName()), def));
@@ -83,8 +86,8 @@ public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
@Override
protected List<EdmEnumType> createEnumTypes() {
- List<EdmEnumType> enumTypes = new ArrayList<EdmEnumType>();
- List<EnumType> providerEnumTypes = schema.getEnumTypes();
+ final List<EdmEnumType> enumTypes = new ArrayList<EdmEnumType>();
+ final List<EnumType> providerEnumTypes = schema.getEnumTypes();
if (providerEnumTypes != null) {
for (EnumType enumType : providerEnumTypes) {
enumTypes.add(new EdmEnumTypeImpl(edm, new FullQualifiedName(namespace, enumType.getName()), enumType));
@@ -95,12 +98,12 @@ public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
@Override
protected List<EdmEntityType> createEntityTypes() {
- List<EdmEntityType> entityTypes = new ArrayList<EdmEntityType>();
- List<? extends EntityType> providerEntityTypes = schema.getEntityTypes();
+ final List<EdmEntityType> entityTypes = new ArrayList<EdmEntityType>();
+ final List<? extends EntityType> providerEntityTypes = schema.getEntityTypes();
if (providerEntityTypes != null) {
for (EntityType entityType : providerEntityTypes) {
- entityTypes.add(EdmEntityTypeImpl.getInstance(edm, new FullQualifiedName(namespace, entityType.getName()),
- entityType));
+ entityTypes.add(EdmEntityTypeImpl.getInstance(edm,
+ new FullQualifiedName(namespace, entityType.getName()), entityType));
}
}
return entityTypes;
@@ -108,12 +111,12 @@ public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
@Override
protected List<EdmComplexType> createComplexTypes() {
- List<EdmComplexType> complexTypes = new ArrayList<EdmComplexType>();
- List<? extends ComplexType> providerComplexTypes = schema.getComplexTypes();
+ final List<EdmComplexType> complexTypes = new ArrayList<EdmComplexType>();
+ final List<? extends ComplexType> providerComplexTypes = schema.getComplexTypes();
if (providerComplexTypes != null) {
for (ComplexType complexType : providerComplexTypes) {
complexTypes.add(EdmComplexTypeImpl.getInstance(edm, new FullQualifiedName(namespace, complexType.getName()),
- complexType));
+ complexType));
}
}
return complexTypes;
@@ -121,9 +124,9 @@ public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
@Override
protected List<EdmAction> createActions() {
- List<EdmAction> actions = new ArrayList<EdmAction>();
+ final List<EdmAction> actions = new ArrayList<EdmAction>();
if (schema instanceof org.apache.olingo.client.api.edm.xml.v4.Schema) {
- List<Action> providerActions = ((org.apache.olingo.client.api.edm.xml.v4.Schema) schema).getActions();
+ final List<Action> providerActions = ((org.apache.olingo.client.api.edm.xml.v4.Schema) schema).getActions();
if (providerActions != null) {
for (Action action : providerActions) {
actions.add(EdmActionImpl.getInstance(edm, new FullQualifiedName(namespace, action.getName()), action));
@@ -135,24 +138,24 @@ public class EdmSchemaImpl extends AbstractEdmSchemaImpl {
@Override
protected List<EdmFunction> createFunctions() {
- List<EdmFunction> functions = new ArrayList<EdmFunction>();
+ final List<EdmFunction> functions = new ArrayList<EdmFunction>();
if (schema instanceof org.apache.olingo.client.api.edm.xml.v4.Schema) {
- List<Function> providerFunctions = ((org.apache.olingo.client.api.edm.xml.v4.Schema) schema).getFunctions();
+ final List<Function> providerFunctions = ((org.apache.olingo.client.api.edm.xml.v4.Schema) schema).getFunctions();
if (providerFunctions != null) {
for (Function function : providerFunctions) {
functions.add(
- EdmFunctionImpl.getInstance(edm, new FullQualifiedName(namespace, function.getName()), function));
+ EdmFunctionImpl.getInstance(edm, new FullQualifiedName(namespace, function.getName()), function));
}
return functions;
}
} else {
for (EntityContainer providerContainer : schema.getEntityContainers()) {
@SuppressWarnings("unchecked")
- List<FunctionImport> providerFunctions = (List<FunctionImport>) providerContainer.getFunctionImports();
+ final List<FunctionImport> providerFunctions = (List<FunctionImport>) providerContainer.getFunctionImports();
if (providerFunctions != null) {
for (FunctionImport function : providerFunctions) {
functions.add(
- EdmFunctionProxy.getInstance(edm, new FullQualifiedName(namespace, function.getName()), function));
+ EdmFunctionProxy.getInstance(edm, new FullQualifiedName(namespace, function.getName()), function));
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
index 077c753..cc2a621 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java
@@ -55,7 +55,6 @@ public class EdmFunctionImportProxy extends EdmOperationImportImpl implements Ed
@Override
public FullQualifiedName getFunctionFqn() {
- //TODO: Is this right for V3?
return new FullQualifiedName(container.getNamespace(), getName());
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
index be93eb9..990cef0 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java
@@ -26,8 +26,6 @@ public class ParameterImpl extends AbstractParameter implements Parameter {
private static final long serialVersionUID = -1067642515116697747L;
private String srid;
-
- private boolean isCollection;
@Override
public String getSrid() {
@@ -38,14 +36,4 @@ public class ParameterImpl extends AbstractParameter implements Parameter {
this.srid = srid;
}
- //TODO: fill during metadata parsing
- @Override
- public boolean isCollection() {
- return isCollection;
- }
-
- public void setCollection(boolean isCollection) {
- this.isCollection = isCollection;
- }
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/950e90cb/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
index 96c6678..3f67ec6 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java
@@ -25,16 +25,16 @@ import java.util.List;
*/
public interface EdmFunctionImport extends EdmOperationImport {
- EdmFunction getFunction(List<String> parameterNames);
-
- /**
- * @return the Fullqualified name for the function as specified in the metadata
- */
- FullQualifiedName getFunctionFqn();
+ EdmFunction getFunction(List<String> parameterNames);
- /**
- * @return true if the function import must be included in the service document
- */
- boolean isIncludeInServiceDocument();
+ /**
+ * @return the Full qualified name for the function as specified in the metadata
+ */
+ FullQualifiedName getFunctionFqn();
+
+ /**
+ * @return true if the function import must be included in the service document
+ */
+ boolean isIncludeInServiceDocument();
}