http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java index 773ca9e..b62325d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmAnnotatable.java @@ -22,8 +22,8 @@ import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotatable; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; -import org.apache.olingo.commons.api.edm.provider.Annotatable; -import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import java.util.ArrayList; import java.util.Collections; @@ -31,11 +31,11 @@ import java.util.List; public abstract class AbstractEdmAnnotatable implements EdmAnnotatable { - private final Annotatable annotatable; + private final CsdlAnnotatable annotatable; private List<EdmAnnotation> annotations; protected final Edm edm; - public AbstractEdmAnnotatable(final Edm edm, final Annotatable annotatable) { + public AbstractEdmAnnotatable(final Edm edm, final CsdlAnnotatable annotatable) { this.edm = edm; this.annotatable = annotatable; } @@ -57,7 +57,7 @@ public abstract class AbstractEdmAnnotatable implements EdmAnnotatable { if (annotations == null) { final List<EdmAnnotation> annotationsLocal = new ArrayList<EdmAnnotation>(); if (annotatable != null) { - for (Annotation annotation : annotatable.getAnnotations()) { + for (CsdlAnnotation annotation : annotatable.getAnnotations()) { annotationsLocal.add(new EdmAnnotationImpl(edm, annotation)); }
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java index 62f12e6..d9503cc 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java @@ -30,17 +30,17 @@ import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmNavigationPropertyBinding; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.BindingTarget; -import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding; +import org.apache.olingo.commons.api.edm.provider.CsdlBindingTarget; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationPropertyBinding; public abstract class AbstractEdmBindingTarget extends AbstractEdmNamed implements EdmBindingTarget { - private final BindingTarget target; + private final CsdlBindingTarget target; private final EdmEntityContainer container; private List<EdmNavigationPropertyBinding> navigationPropertyBindings; - public AbstractEdmBindingTarget(final Edm edm, final EdmEntityContainer container, final BindingTarget target) { + public AbstractEdmBindingTarget(final Edm edm, final EdmEntityContainer container, final CsdlBindingTarget target) { super(edm, target.getName(), target); this.container = container; this.target = target; @@ -49,11 +49,11 @@ public abstract class AbstractEdmBindingTarget extends AbstractEdmNamed implemen @Override public List<EdmNavigationPropertyBinding> getNavigationPropertyBindings() { if (navigationPropertyBindings == null) { - List<NavigationPropertyBinding> providerBindings = target.getNavigationPropertyBindings(); + List<CsdlNavigationPropertyBinding> providerBindings = target.getNavigationPropertyBindings(); final List<EdmNavigationPropertyBinding> navigationPropertyBindingsLocal = new ArrayList<EdmNavigationPropertyBinding>(); if (providerBindings != null) { - for (NavigationPropertyBinding binding : providerBindings) { + for (CsdlNavigationPropertyBinding binding : providerBindings) { navigationPropertyBindingsLocal.add(new EdmNavigationPropertyBindingImpl(binding.getPath(), binding.getTarget())); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java index ced2b92..36638fd 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmNamed.java @@ -20,13 +20,13 @@ package org.apache.olingo.commons.core.edm; import org.apache.olingo.commons.api.edm.Edm; 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.CsdlAnnotatable; public abstract class AbstractEdmNamed extends AbstractEdmAnnotatable implements EdmNamed { private final String name; - public AbstractEdmNamed(final Edm edm, final String name, final Annotatable annotatable) { + public AbstractEdmNamed(final Edm edm, final String name, final CsdlAnnotatable annotatable) { super(edm, annotatable); this.name = name; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java index 6fc4f91..d5dd4be 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java @@ -33,17 +33,17 @@ import org.apache.olingo.commons.api.edm.EdmParameter; import org.apache.olingo.commons.api.edm.EdmReturnType; 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.Operation; -import org.apache.olingo.commons.api.edm.provider.Parameter; +import org.apache.olingo.commons.api.edm.provider.CsdlOperation; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; public abstract class AbstractEdmOperation extends EdmTypeImpl implements EdmOperation { - private final Operation operation; + private final CsdlOperation operation; private Map<String, EdmParameter> parameters; private List<String> parameterNames; private EdmReturnType returnType; - protected AbstractEdmOperation(final Edm edm, final FullQualifiedName name, final Operation operation, + protected AbstractEdmOperation(final Edm edm, final FullQualifiedName name, final CsdlOperation operation, final EdmTypeKind kind) { super(edm, name, kind, operation); @@ -69,10 +69,10 @@ public abstract class AbstractEdmOperation extends EdmTypeImpl implements EdmOpe private void createParameters() { if(parameters == null) { final Map<String, EdmParameter> parametersLocal = new LinkedHashMap<String, EdmParameter>(); - final List<Parameter> providerParameters = operation.getParameters(); + final List<CsdlParameter> providerParameters = operation.getParameters(); if (providerParameters != null) { final List<String> parameterNamesLocal = new ArrayList<String>(providerParameters.size()); - for (Parameter parameter : providerParameters) { + for (CsdlParameter parameter : providerParameters) { parametersLocal.put(parameter.getName(), new EdmParameterImpl(edm, parameter)); parameterNamesLocal.add(parameter.getName()); } @@ -120,7 +120,7 @@ public abstract class AbstractEdmOperation extends EdmTypeImpl implements EdmOpe @Override public FullQualifiedName getBindingParameterTypeFqn() { if (isBound()) { - Parameter bindingParameter = operation.getParameters().get(0); + CsdlParameter bindingParameter = operation.getParameters().get(0); return bindingParameter.getTypeFQN(); } return null; @@ -129,7 +129,7 @@ public abstract class AbstractEdmOperation extends EdmTypeImpl implements EdmOpe @Override public Boolean isBindingParameterTypeCollection() { if (isBound()) { - Parameter bindingParameter = operation.getParameters().get(0); + CsdlParameter bindingParameter = operation.getParameters().get(0); return bindingParameter.isCollection(); } return null; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java index c36c44f..356500a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperationImport.java @@ -24,7 +24,7 @@ import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmOperationImport; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.OperationImport; +import org.apache.olingo.commons.api.edm.provider.CsdlOperationImport; public abstract class AbstractEdmOperationImport extends AbstractEdmNamed implements EdmOperationImport { @@ -33,7 +33,7 @@ public abstract class AbstractEdmOperationImport extends AbstractEdmNamed implem private EdmEntitySet returnedEntitySet; public AbstractEdmOperationImport(final Edm edm, final EdmEntityContainer container, - final OperationImport operationImport) { + final CsdlOperationImport operationImport) { super(edm, operationImport.getName(), operationImport); this.container = container; if (operationImport.getEntitySet() != null) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java index 736b69b..1c96a6b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java @@ -27,9 +27,9 @@ import org.apache.olingo.commons.api.edm.EdmStructuredType; import org.apache.olingo.commons.api.edm.EdmType; 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.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.StructuralType; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlStructuralType; import java.util.ArrayList; import java.util.Collections; @@ -42,7 +42,7 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E protected EdmStructuredType baseType; protected FullQualifiedName baseTypeName; - private final StructuralType providerStructuredType; + private final CsdlStructuralType providerStructuredType; private List<String> propertyNames; private Map<String, EdmProperty> properties; @@ -53,7 +53,7 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E final Edm edm, final FullQualifiedName typeName, final EdmTypeKind kind, - final StructuralType structuredType) { + final CsdlStructuralType structuredType) { super(edm, typeName, kind, structuredType); this.baseTypeName = structuredType.getBaseTypeFQN(); @@ -158,8 +158,8 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E public Map<String, EdmProperty> getProperties() { if (properties == null) { final Map<String, EdmProperty> localPorperties = new LinkedHashMap<String, EdmProperty>(); - final List<Property> structureTypeProperties = providerStructuredType.getProperties(); - for (Property property : structureTypeProperties) { + final List<CsdlProperty> structureTypeProperties = providerStructuredType.getProperties(); + for (CsdlProperty property : structureTypeProperties) { localPorperties.put(property.getName(), new EdmPropertyImpl(edm, typeName, property)); } properties = Collections.unmodifiableMap(localPorperties); @@ -171,11 +171,11 @@ public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements E if (navigationProperties == null) { final Map<String, EdmNavigationProperty> localNavigationProperties = new LinkedHashMap<String, EdmNavigationProperty>(); - final List<NavigationProperty> structuredTypeNavigationProperties = + final List<CsdlNavigationProperty> structuredTypeNavigationProperties = providerStructuredType.getNavigationProperties(); if (structuredTypeNavigationProperties != null) { - for (NavigationProperty navigationProperty : structuredTypeNavigationProperties) { + for (CsdlNavigationProperty navigationProperty : structuredTypeNavigationProperties) { localNavigationProperties.put(navigationProperty.getName(), new EdmNavigationPropertyImpl(edm, typeName, navigationProperty)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java index 91296d5..a7b42d3 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImpl.java @@ -22,11 +22,11 @@ import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; 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.Action; +import org.apache.olingo.commons.api.edm.provider.CsdlAction; public class EdmActionImpl extends AbstractEdmOperation implements EdmAction { - public EdmActionImpl(final Edm edm, final FullQualifiedName name, final Action action) { + public EdmActionImpl(final Edm edm, final FullQualifiedName name, final CsdlAction action) { super(edm, name, action, EdmTypeKind.ACTION); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java index 43e2f0b..c36b947 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportImpl.java @@ -22,13 +22,13 @@ import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.provider.ActionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlActionImport; public class EdmActionImportImpl extends AbstractEdmOperationImport implements EdmActionImport { - private final ActionImport actionImport; + private final CsdlActionImport actionImport; - public EdmActionImportImpl(final Edm edm, final EdmEntityContainer container, final ActionImport actionImport) { + public EdmActionImportImpl(final Edm edm, final EdmEntityContainer container, final CsdlActionImport actionImport) { super(edm, container, actionImport); this.actionImport = actionImport; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java index 8006639..f38a2bc 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationImpl.java @@ -29,8 +29,8 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmPropertyValue; -import org.apache.olingo.commons.api.edm.provider.Annotatable; -import org.apache.olingo.commons.api.edm.provider.Annotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; import org.apache.olingo.commons.api.edm.provider.annotation.AnnotationExpression; import org.apache.olingo.commons.api.edm.provider.annotation.DynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.provider.annotation.PropertyValue; @@ -62,11 +62,11 @@ import org.apache.olingo.commons.core.edm.annotation.EdmUrlRefImpl; public class EdmAnnotationImpl extends AbstractEdmAnnotatable implements EdmAnnotation { - private final Annotation annotation; + private final CsdlAnnotation annotation; private EdmTerm term; private EdmAnnotationExpression expression; - public EdmAnnotationImpl(final Edm edm, final Annotation annotation) { + public EdmAnnotationImpl(final Edm edm, final CsdlAnnotation annotation) { super(edm, annotation); this.annotation = annotation; } @@ -206,8 +206,8 @@ public class EdmAnnotationImpl extends AbstractEdmAnnotatable implements EdmAnno _expression = new EdmUrlRefImpl(getExpression(exp.asUrlRef().getValue())); } - if (_expression instanceof EdmAnnotatable && exp instanceof Annotatable) { - for (Annotation _annotation : ((Annotatable) exp).getAnnotations()) { + if (_expression instanceof EdmAnnotatable && exp instanceof CsdlAnnotatable) { + for (CsdlAnnotation _annotation : ((CsdlAnnotatable) exp).getAnnotations()) { ((EdmAnnotatable) _expression).getAnnotations().add(new EdmAnnotationImpl(edm, _annotation)); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java index 0b10b17..772838b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmAnnotationsImpl.java @@ -33,18 +33,18 @@ import org.apache.olingo.commons.api.edm.EdmSchema; import org.apache.olingo.commons.api.edm.EdmStructuredType; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Annotation; -import org.apache.olingo.commons.api.edm.provider.Annotations; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotations; public class EdmAnnotationsImpl implements EdmAnnotations { private final Edm edm; private final EdmSchema schema; - private final Annotations annotationGroup; + private final CsdlAnnotations annotationGroup; private EdmAnnotationsTarget target; private List<EdmAnnotation> annotations; - public EdmAnnotationsImpl(final Edm edm, final EdmSchema schema, final Annotations annotationGroup) { + public EdmAnnotationsImpl(final Edm edm, final EdmSchema schema, final CsdlAnnotations annotationGroup) { this.edm = edm; this.schema = schema; this.annotationGroup = annotationGroup; @@ -139,7 +139,7 @@ public class EdmAnnotationsImpl implements EdmAnnotations { public List<EdmAnnotation> getAnnotations() { if (annotations == null) { List<EdmAnnotation> annotationsLocal = new ArrayList<EdmAnnotation>(); - for (Annotation annotation : annotationGroup.getAnnotations()) { + for (CsdlAnnotation annotation : annotationGroup.getAnnotations()) { annotationsLocal.add(new EdmAnnotationImpl(edm, annotation)); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java index d39d594..20e0836 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmComplexTypeImpl.java @@ -24,11 +24,11 @@ import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmStructuredType; 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.ComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; public class EdmComplexTypeImpl extends AbstractEdmStructuredType implements EdmComplexType { - public EdmComplexTypeImpl(final Edm edm, final FullQualifiedName name, final ComplexType complexType) { + public EdmComplexTypeImpl(final Edm edm, final FullQualifiedName name, final CsdlComplexType complexType) { super(edm, name, EdmTypeKind.COMPLEX, complexType); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java index 2c6d871..3112f4b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityContainerImpl.java @@ -33,18 +33,18 @@ import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ActionImport; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityContainer; -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.api.edm.provider.CsdlActionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainer; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; +import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlSingleton; public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntityContainer { - private final EdmProvider provider; - private EntityContainer container; + private final CsdlEdmProvider provider; + private CsdlEntityContainer container; private final FullQualifiedName entityContainerName; private final FullQualifiedName parentContainerName; @@ -62,16 +62,16 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit private final Map<String, EdmFunctionImport> functionImportCache = Collections.synchronizedMap( new LinkedHashMap<String, EdmFunctionImport>()); - public EdmEntityContainerImpl(final Edm edm, final EdmProvider provider, - final EntityContainerInfo entityContainerInfo) { + public EdmEntityContainerImpl(final Edm edm, final CsdlEdmProvider provider, + final CsdlEntityContainerInfo entityContainerInfo) { super(edm, entityContainerInfo.getContainerName().getName(), null); this.provider = provider; this.entityContainerName = entityContainerInfo.getContainerName(); this.parentContainerName = entityContainerInfo.getExtendsContainer(); } - public EdmEntityContainerImpl(final Edm edm, final EdmProvider provider, final FullQualifiedName containerFQN, - final EntityContainer entityContainer) { + public EdmEntityContainerImpl(final Edm edm, final CsdlEdmProvider provider, final FullQualifiedName containerFQN, + final CsdlEntityContainer entityContainer) { super(edm, containerFQN.getName(), entityContainer); this.provider = provider; container = entityContainer; @@ -178,7 +178,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit EdmSingleton singleton = null; try { - final Singleton providerSingleton = provider.getSingleton(entityContainerName, singletonName); + final CsdlSingleton providerSingleton = provider.getSingleton(entityContainerName, singletonName); if (providerSingleton != null) { singleton = new EdmSingletonImpl(edm, this, providerSingleton); } @@ -193,7 +193,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit EdmEntitySet entitySet = null; try { - final EntitySet providerEntitySet = provider.getEntitySet(entityContainerName, entitySetName); + final CsdlEntitySet providerEntitySet = provider.getEntitySet(entityContainerName, entitySetName); if (providerEntitySet != null) { entitySet = new EdmEntitySetImpl(edm, this, providerEntitySet); } @@ -208,7 +208,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit EdmActionImport actionImport = null; try { - final ActionImport providerImport = provider.getActionImport(entityContainerName, actionImportName); + final CsdlActionImport providerImport = provider.getActionImport(entityContainerName, actionImportName); if (providerImport != null) { actionImport = new EdmActionImportImpl(edm, this, providerImport); } @@ -223,7 +223,7 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit EdmFunctionImport functionImport = null; try { - final FunctionImport providerImport = provider.getFunctionImport(entityContainerName, functionImportName); + final CsdlFunctionImport providerImport = provider.getFunctionImport(entityContainerName, functionImportName); if (providerImport != null) { functionImport = new EdmFunctionImportImpl(edm, this, providerImport); } @@ -236,11 +236,11 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit protected void loadAllEntitySets() { loadContainer(); - final List<EntitySet> providerEntitySets = container.getEntitySets(); + final List<CsdlEntitySet> providerEntitySets = container.getEntitySets(); final List<EdmEntitySet> entitySetsLocal = new ArrayList<EdmEntitySet>(); if (providerEntitySets != null) { - for (EntitySet entitySet : providerEntitySets) { + for (CsdlEntitySet entitySet : providerEntitySets) { final EdmEntitySetImpl impl = new EdmEntitySetImpl(edm, this, entitySet); entitySetCache.put(impl.getName(), impl); entitySetsLocal.add(impl); @@ -251,11 +251,11 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit protected void loadAllFunctionImports() { loadContainer(); - final List<FunctionImport> providerFunctionImports = container.getFunctionImports(); + final List<CsdlFunctionImport> providerFunctionImports = container.getFunctionImports(); final ArrayList<EdmFunctionImport> functionImportsLocal = new ArrayList<EdmFunctionImport>(); if (providerFunctionImports != null) { - for (FunctionImport functionImport : providerFunctionImports) { + for (CsdlFunctionImport functionImport : providerFunctionImports) { EdmFunctionImportImpl impl = new EdmFunctionImportImpl(edm, this, functionImport); functionImportCache.put(impl.getName(), impl); functionImportsLocal.add(impl); @@ -266,11 +266,11 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit protected void loadAllSingletons() { loadContainer(); - final List<Singleton> providerSingletons = container.getSingletons(); + final List<CsdlSingleton> providerSingletons = container.getSingletons(); final List<EdmSingleton> singletonsLocal = new ArrayList<EdmSingleton>(); if (providerSingletons != null) { - for (Singleton singleton : providerSingletons) { + for (CsdlSingleton singleton : providerSingletons) { final EdmSingletonImpl impl = new EdmSingletonImpl(edm, this, singleton); singletonCache.put(singleton.getName(), impl); singletonsLocal.add(impl); @@ -281,11 +281,11 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit protected void loadAllActionImports() { loadContainer(); - final List<ActionImport> providerActionImports = container.getActionImports(); + final List<CsdlActionImport> providerActionImports = container.getActionImports(); final List<EdmActionImport> actionImportsLocal = new ArrayList<EdmActionImport>(); if (providerActionImports != null) { - for (ActionImport actionImport : providerActionImports) { + for (CsdlActionImport actionImport : providerActionImports) { final EdmActionImportImpl impl = new EdmActionImportImpl(edm, this, actionImport); actionImportCache.put(actionImport.getName(), impl); actionImportsLocal.add(impl); @@ -298,9 +298,9 @@ public class EdmEntityContainerImpl extends AbstractEdmNamed implements EdmEntit private void loadContainer() { if (container == null) { try { - EntityContainer containerLocal = provider.getEntityContainer(); + CsdlEntityContainer containerLocal = provider.getEntityContainer(); if (containerLocal == null) { - containerLocal = new EntityContainer().setName(getName()); + containerLocal = new CsdlEntityContainer().setName(getName()); } container = containerLocal; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java index 2d4bd0d..a840841 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetImpl.java @@ -21,13 +21,13 @@ package org.apache.olingo.commons.core.edm; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.commons.api.edm.provider.EntitySet; +import org.apache.olingo.commons.api.edm.provider.CsdlEntitySet; public class EdmEntitySetImpl extends AbstractEdmBindingTarget implements EdmEntitySet { - private EntitySet entitySet; + private CsdlEntitySet entitySet; - public EdmEntitySetImpl(final Edm edm, final EdmEntityContainer container, final EntitySet entitySet) { + public EdmEntitySetImpl(final Edm edm, final EdmEntityContainer container, final CsdlEntitySet entitySet) { super(edm, container, entitySet); this.entitySet = entitySet; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java index e6fefca..73d8758 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntityTypeImpl.java @@ -31,12 +31,12 @@ import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; import org.apache.olingo.commons.api.edm.EdmStructuredType; 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.EntityType; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; public class EdmEntityTypeImpl extends AbstractEdmStructuredType implements EdmEntityType { - private EntityType entityType; + private CsdlEntityType entityType; private boolean baseTypeChecked = false; private final boolean hasStream; protected EdmEntityType entityBaseType; @@ -45,7 +45,7 @@ public class EdmEntityTypeImpl extends AbstractEdmStructuredType implements EdmE Collections.synchronizedMap(new LinkedHashMap<String, EdmKeyPropertyRef>()); private List<EdmKeyPropertyRef> keyPropertyRefsList; - public EdmEntityTypeImpl(final Edm edm, final FullQualifiedName name, final EntityType entityType) { + public EdmEntityTypeImpl(final Edm edm, final FullQualifiedName name, final CsdlEntityType entityType) { super(edm, name, EdmTypeKind.ENTITY, entityType); this.entityType = entityType; hasStream = entityType.hasStream(); @@ -60,10 +60,10 @@ public class EdmEntityTypeImpl extends AbstractEdmStructuredType implements EdmE } if (baseType == null || (baseType.isAbstract() && ((EdmEntityType) baseType).getKeyPropertyRefs().size() == 0)) { - final List<PropertyRef> key = entityType.getKey(); + final List<CsdlPropertyRef> key = entityType.getKey(); if (key != null) { final List<EdmKeyPropertyRef> edmKey = new ArrayList<EdmKeyPropertyRef>(); - for (PropertyRef ref : key) { + for (CsdlPropertyRef ref : key) { edmKey.add(new EdmKeyPropertyRefImpl(this, ref)); } setEdmKeyPropertyRef(edmKey); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java index 95866fd..d04e406 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEnumTypeImpl.java @@ -35,8 +35,8 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; 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.EnumMember; -import org.apache.olingo.commons.api.edm.provider.EnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; import org.apache.olingo.commons.core.edm.primitivetype.EdmInt64; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; @@ -52,13 +52,13 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { } private final EdmPrimitiveType underlyingType; - private final EnumType enumType; + private final CsdlEnumType enumType; private final String uriPrefix; private final String uriSuffix; private List<String> memberNames; private LinkedHashMap<String, EdmMember> membersMap; - public EdmEnumTypeImpl(final Edm edm, final FullQualifiedName enumName, final EnumType enumType) { + public EdmEnumTypeImpl(final Edm edm, final FullQualifiedName enumName, final CsdlEnumType enumType) { super(edm, enumName, EdmTypeKind.ENUM, enumType); if (enumType.getUnderlyingType() == null) { @@ -102,7 +102,7 @@ public class EdmEnumTypeImpl extends EdmTypeImpl implements EdmEnumType { final LinkedHashMap<String, EdmMember> membersMapLocal = new LinkedHashMap<String, EdmMember>(); final List<String> memberNamesLocal = new ArrayList<String>(); if (enumType.getMembers() != null) { - for (final EnumMember member : enumType.getMembers()) { + for (final CsdlEnumMember member : enumType.getMembers()) { membersMapLocal.put(member.getName(), new EdmMemberImpl(edm, getFullQualifiedName(), member)); memberNamesLocal.add(member.getName()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java index 01d20ea..8ed366b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImpl.java @@ -24,13 +24,13 @@ import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmReturnType; 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.Function; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; public class EdmFunctionImpl extends AbstractEdmOperation implements EdmFunction { - private final Function function; + private final CsdlFunction function; - public EdmFunctionImpl(final Edm edm, final FullQualifiedName name, final Function function) { + public EdmFunctionImpl(final Edm edm, final FullQualifiedName name, final CsdlFunction function) { super(edm, name, function, EdmTypeKind.FUNCTION); this.function = function; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java index ea9037d..64a80c6 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportImpl.java @@ -25,13 +25,14 @@ import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.FunctionImport; +import org.apache.olingo.commons.api.edm.provider.CsdlFunctionImport; public class EdmFunctionImportImpl extends AbstractEdmOperationImport implements EdmFunctionImport { - private final FunctionImport functionImport; + private final CsdlFunctionImport functionImport; - public EdmFunctionImportImpl(final Edm edm, final EdmEntityContainer container, final FunctionImport functionImport) { + public EdmFunctionImportImpl(final Edm edm, final EdmEntityContainer container, + final CsdlFunctionImport functionImport) { super(edm, container, functionImport); this.functionImport = functionImport; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java index 0f69deb..13199ee 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmKeyPropertyRefImpl.java @@ -23,15 +23,15 @@ 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.EdmStructuredType; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.commons.api.edm.provider.CsdlPropertyRef; public class EdmKeyPropertyRefImpl implements EdmKeyPropertyRef { - private final PropertyRef ref; + private final CsdlPropertyRef ref; private EdmEntityType edmEntityType; private EdmProperty property; - public EdmKeyPropertyRefImpl(final EdmEntityType edmEntityType, final PropertyRef ref) { + public EdmKeyPropertyRefImpl(final EdmEntityType edmEntityType, final CsdlPropertyRef ref) { this.edmEntityType = edmEntityType; this.ref = ref; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java index 362dd72..7fd05e4 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmMemberImpl.java @@ -21,14 +21,14 @@ package org.apache.olingo.commons.core.edm; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmMember; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.EnumMember; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumMember; public class EdmMemberImpl extends AbstractEdmNamed implements EdmMember { private final FullQualifiedName enumFQN; - private final EnumMember member; + private final CsdlEnumMember member; - public EdmMemberImpl(final Edm edm, final FullQualifiedName enumFQN, final EnumMember member) { + public EdmMemberImpl(final Edm edm, final FullQualifiedName enumFQN, final CsdlEnumMember member) { super(edm, member.getName(), member); this.enumFQN = enumFQN; this.member = member; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java index 71f0a57..2904dea 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmNavigationPropertyImpl.java @@ -30,19 +30,19 @@ import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmReferentialConstraint; import org.apache.olingo.commons.api.edm.EdmStructuredType; 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.ReferentialConstraint; +import org.apache.olingo.commons.api.edm.provider.CsdlNavigationProperty; +import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint; public class EdmNavigationPropertyImpl extends AbstractEdmNamed implements EdmElement, EdmNavigationProperty { private final FullQualifiedName structuredTypeName; - private final NavigationProperty navigationProperty; + private final CsdlNavigationProperty navigationProperty; private List<EdmReferentialConstraint> referentialConstraints; private EdmEntityType typeImpl; private EdmNavigationProperty partnerNavigationProperty; public EdmNavigationPropertyImpl( - final Edm edm, final FullQualifiedName structuredTypeName, final NavigationProperty navigationProperty) { + final Edm edm, final FullQualifiedName structuredTypeName, final CsdlNavigationProperty navigationProperty) { super(edm, navigationProperty.getName(), navigationProperty); this.structuredTypeName = structuredTypeName; this.navigationProperty = navigationProperty; @@ -98,9 +98,9 @@ public class EdmNavigationPropertyImpl extends AbstractEdmNamed implements EdmEl @Override public String getReferencingPropertyName(final String referencedPropertyName) { - final List<ReferentialConstraint> referentialConstraints = navigationProperty.getReferentialConstraints(); + final List<CsdlReferentialConstraint> referentialConstraints = navigationProperty.getReferentialConstraints(); if (referentialConstraints != null) { - for (ReferentialConstraint constraint : referentialConstraints) { + for (CsdlReferentialConstraint constraint : referentialConstraints) { if (constraint.getReferencedProperty().equals(referencedPropertyName)) { return constraint.getProperty(); } @@ -112,10 +112,10 @@ public class EdmNavigationPropertyImpl extends AbstractEdmNamed implements EdmEl @Override public List<EdmReferentialConstraint> getReferentialConstraints() { if (referentialConstraints == null) { - final List<ReferentialConstraint> providerConstraints = navigationProperty.getReferentialConstraints(); + final List<CsdlReferentialConstraint> providerConstraints = navigationProperty.getReferentialConstraints(); final List<EdmReferentialConstraint> referentialConstraintsLocal = new ArrayList<EdmReferentialConstraint>(); if (providerConstraints != null) { - for (ReferentialConstraint constraint : providerConstraints) { + for (CsdlReferentialConstraint constraint : providerConstraints) { referentialConstraintsLocal.add(new EdmReferentialConstraintImpl(edm, constraint)); } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java index e32bc6f..33f2fd0 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmParameterImpl.java @@ -25,15 +25,15 @@ import org.apache.olingo.commons.api.edm.EdmMapping; import org.apache.olingo.commons.api.edm.EdmParameter; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.Parameter; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; public class EdmParameterImpl extends AbstractEdmNamed implements EdmParameter, EdmElement { - private final Parameter parameter; + private final CsdlParameter parameter; private final EdmTypeInfo typeInfo; private EdmType typeImpl; - public EdmParameterImpl(final Edm edm, final Parameter parameter) { + public EdmParameterImpl(final Edm edm, final CsdlParameter parameter) { super(edm, parameter.getName(), parameter); this.parameter = parameter; this.typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(parameter.getType()).build(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java index 494744b..853e235 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmPropertyImpl.java @@ -26,16 +26,16 @@ import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.EdmType; 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.Property; +import org.apache.olingo.commons.api.edm.provider.CsdlProperty; public class EdmPropertyImpl extends AbstractEdmNamed implements EdmProperty, EdmElement { private final FullQualifiedName structuredTypeName; - private final Property property; + private final CsdlProperty property; private final EdmTypeInfo typeInfo; private EdmType propertyType; - public EdmPropertyImpl(final Edm edm, final FullQualifiedName structuredTypeName, final Property property) { + public EdmPropertyImpl(final Edm edm, final FullQualifiedName structuredTypeName, final CsdlProperty property) { super(edm, property.getName(), property); this.structuredTypeName = structuredTypeName; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java index 62efd32..4f3c004 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmProviderImpl.java @@ -39,38 +39,38 @@ import org.apache.olingo.commons.api.edm.EdmSchema; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Action; -import org.apache.olingo.commons.api.edm.provider.AliasInfo; -import org.apache.olingo.commons.api.edm.provider.Annotatable; -import org.apache.olingo.commons.api.edm.provider.Annotation; -import org.apache.olingo.commons.api.edm.provider.Annotations; -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.EntityContainerInfo; -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.Function; -import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.api.edm.provider.Schema; -import org.apache.olingo.commons.api.edm.provider.Term; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlAction; +import org.apache.olingo.commons.api.edm.provider.CsdlAliasInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotatable; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotations; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityContainerInfo; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; +import org.apache.olingo.commons.api.edm.provider.CsdlParameter; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; +import org.apache.olingo.commons.api.edm.provider.CsdlTerm; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; public class EdmProviderImpl extends AbstractEdm { - private final EdmProvider provider; - private final Map<FullQualifiedName, List<Action>> actionsMap = - Collections.synchronizedMap(new HashMap<FullQualifiedName, List<Action>>()); - private final Map<FullQualifiedName, List<Function>> functionsMap = - Collections.synchronizedMap(new HashMap<FullQualifiedName, List<Function>>()); + private final CsdlEdmProvider provider; + private final Map<FullQualifiedName, List<CsdlAction>> actionsMap = + Collections.synchronizedMap(new HashMap<FullQualifiedName, List<CsdlAction>>()); + private final Map<FullQualifiedName, List<CsdlFunction>> functionsMap = + Collections.synchronizedMap(new HashMap<FullQualifiedName, List<CsdlFunction>>()); - public EdmProviderImpl(final EdmProvider provider) { + public EdmProviderImpl(final CsdlEdmProvider provider) { this.provider = provider; } @Override public EdmEntityContainer createEntityContainer(final FullQualifiedName containerName) { try { - EntityContainerInfo entityContainerInfo = provider.getEntityContainerInfo(containerName); + CsdlEntityContainerInfo entityContainerInfo = provider.getEntityContainerInfo(containerName); if (entityContainerInfo != null) { return new EdmEntityContainerImpl(this, provider, entityContainerInfo); } @@ -83,7 +83,7 @@ public class EdmProviderImpl extends AbstractEdm { @Override public EdmEnumType createEnumType(final FullQualifiedName enumName) { try { - EnumType enumType = provider.getEnumType(enumName); + CsdlEnumType enumType = provider.getEnumType(enumName); if (enumType != null) { return new EdmEnumTypeImpl(this, enumName, enumType); } @@ -96,7 +96,7 @@ public class EdmProviderImpl extends AbstractEdm { @Override public EdmTypeDefinition createTypeDefinition(final FullQualifiedName typeDefinitionName) { try { - TypeDefinition typeDefinition = provider.getTypeDefinition(typeDefinitionName); + CsdlTypeDefinition typeDefinition = provider.getTypeDefinition(typeDefinitionName); if (typeDefinition != null) { return new EdmTypeDefinitionImpl(this, typeDefinitionName, typeDefinition); } @@ -109,7 +109,7 @@ public class EdmProviderImpl extends AbstractEdm { @Override public EdmEntityType createEntityType(final FullQualifiedName entityTypeName) { try { - EntityType entityType = provider.getEntityType(entityTypeName); + CsdlEntityType entityType = provider.getEntityType(entityTypeName); if (entityType != null) { return new EdmEntityTypeImpl(this, entityTypeName, entityType); } @@ -122,7 +122,7 @@ public class EdmProviderImpl extends AbstractEdm { @Override public EdmComplexType createComplexType(final FullQualifiedName complexTypeName) { try { - final ComplexType complexType = provider.getComplexType(complexTypeName); + final CsdlComplexType complexType = provider.getComplexType(complexTypeName); if (complexType != null) { return new EdmComplexTypeImpl(this, complexTypeName, complexType); } @@ -137,7 +137,7 @@ public class EdmProviderImpl extends AbstractEdm { final FullQualifiedName bindingParameterTypeName, final Boolean isBindingParameterCollection) { try { - List<Action> actions = actionsMap.get(actionName); + List<CsdlAction> actions = actionsMap.get(actionName); if (actions == null) { actions = provider.getActions(actionName); if (actions == null) { @@ -147,10 +147,10 @@ public class EdmProviderImpl extends AbstractEdm { } } // Search for bound action where binding parameter matches - for (Action action : actions) { + for (CsdlAction action : actions) { if (action.isBound()) { - final List<Parameter> parameters = action.getParameters(); - final Parameter parameter = parameters.get(0); + final List<CsdlParameter> parameters = action.getParameters(); + final CsdlParameter parameter = parameters.get(0); if (bindingParameterTypeName.equals(parameter.getTypeFQN()) && isBindingParameterCollection.booleanValue() == parameter.isCollection()) { @@ -171,7 +171,7 @@ public class EdmProviderImpl extends AbstractEdm { final List<String> parameterNames) { try { - List<Function> functions = functionsMap.get(functionName); + List<CsdlFunction> functions = functionsMap.get(functionName); if (functions == null) { functions = provider.getFunctions(functionName); if (functions == null) { @@ -182,13 +182,13 @@ public class EdmProviderImpl extends AbstractEdm { } final List<String> parameterNamesCopy = parameterNames == null ? Collections.<String> emptyList() : parameterNames; - for (Function function : functions) { + for (CsdlFunction function : functions) { if (function.isBound()) { - List<Parameter> providerParameters = function.getParameters(); + List<CsdlParameter> providerParameters = function.getParameters(); if (providerParameters == null || providerParameters.size() == 0) { throw new EdmException("No parameter specified for bound function: " + functionName); } - final Parameter bindingParameter = providerParameters.get(0); + final CsdlParameter bindingParameter = providerParameters.get(0); if (bindingParameterTypeName.equals(bindingParameter.getTypeFQN()) && isBindingParameterCollection.booleanValue() == bindingParameter.isCollection()) { @@ -214,9 +214,9 @@ public class EdmProviderImpl extends AbstractEdm { protected Map<String, String> createAliasToNamespaceInfo() { final Map<String, String> aliasToNamespaceInfos = new HashMap<String, String>(); try { - final List<AliasInfo> aliasInfos = provider.getAliasInfos(); + final List<CsdlAliasInfo> aliasInfos = provider.getAliasInfos(); if (aliasInfos != null) { - for (AliasInfo info : aliasInfos) { + for (CsdlAliasInfo info : aliasInfos) { aliasToNamespaceInfos.put(info.getAlias(), info.getNamespace()); } } @@ -229,7 +229,7 @@ public class EdmProviderImpl extends AbstractEdm { @Override protected EdmAction createUnboundAction(final FullQualifiedName actionName) { try { - List<Action> actions = actionsMap.get(actionName); + List<CsdlAction> actions = actionsMap.get(actionName); if (actions == null) { actions = provider.getActions(actionName); if (actions == null) { @@ -239,7 +239,7 @@ public class EdmProviderImpl extends AbstractEdm { } } // Search for first unbound action - for (Action action : actions) { + for (CsdlAction action : actions) { if (!action.isBound()) { return new EdmActionImpl(this, actionName, action); } @@ -255,7 +255,7 @@ public class EdmProviderImpl extends AbstractEdm { List<EdmFunction> result = new ArrayList<EdmFunction>(); try { - List<Function> functions = functionsMap.get(functionName); + List<CsdlFunction> functions = functionsMap.get(functionName); if (functions == null) { functions = provider.getFunctions(functionName); if (functions != null) { @@ -263,7 +263,7 @@ public class EdmProviderImpl extends AbstractEdm { } } if (functions != null) { - for (Function function : functions) { + for (CsdlFunction function : functions) { if (!function.isBound()) { result.add(new EdmFunctionImpl(this, functionName, function)); } @@ -279,7 +279,7 @@ public class EdmProviderImpl extends AbstractEdm { @Override protected EdmFunction createUnboundFunction(final FullQualifiedName functionName, final List<String> parameterNames) { try { - List<Function> functions = functionsMap.get(functionName); + List<CsdlFunction> functions = functionsMap.get(functionName); if (functions == null) { functions = provider.getFunctions(functionName); if (functions == null) { @@ -291,15 +291,15 @@ public class EdmProviderImpl extends AbstractEdm { final List<String> parameterNamesCopy = parameterNames == null ? Collections.<String> emptyList() : parameterNames; - for (Function function : functions) { + for (CsdlFunction function : functions) { if (!function.isBound()) { - List<Parameter> providerParameters = function.getParameters(); + List<CsdlParameter> providerParameters = function.getParameters(); if (providerParameters == null) { providerParameters = Collections.emptyList(); } if (parameterNamesCopy.size() == providerParameters.size()) { final List<String> functionParameterNames = new ArrayList<String>(); - for (Parameter parameter : providerParameters) { + for (CsdlParameter parameter : providerParameters) { functionParameterNames.add(parameter.getName()); } @@ -319,7 +319,7 @@ public class EdmProviderImpl extends AbstractEdm { protected Map<String, EdmSchema> createSchemas() { try { final Map<String, EdmSchema> providerSchemas = new LinkedHashMap<String, EdmSchema>(); - for (Schema schema : provider.getSchemas()) { + for (CsdlSchema schema : provider.getSchemas()) { providerSchemas.put(schema.getNamespace(), new EdmSchemaImpl(this, provider, schema)); } return providerSchemas; @@ -331,7 +331,7 @@ public class EdmProviderImpl extends AbstractEdm { @Override protected EdmTerm createTerm(final FullQualifiedName termName) { try { - Term providerTerm = provider.getTerm(termName); + CsdlTerm providerTerm = provider.getTerm(termName); if (providerTerm != null) { return new EdmTermImpl(this, termName.getNamespace(), providerTerm); } @@ -346,7 +346,7 @@ public class EdmProviderImpl extends AbstractEdm { protected EdmAnnotations createAnnotationGroup(final FullQualifiedName targetName) { try { EdmSchema schema = getSchema(targetName.getNamespace()); - Annotations providerGroup = provider.getAnnotationsGroup(targetName); + CsdlAnnotations providerGroup = provider.getAnnotationsGroup(targetName); if (providerGroup != null) { return new EdmAnnotationsImpl(this, schema, providerGroup); } @@ -359,10 +359,10 @@ public class EdmProviderImpl extends AbstractEdm { @Override protected List<EdmAnnotation> createAnnotations(final FullQualifiedName annotatedName) { try { - Annotatable providerAnnotatable = provider.getAnnoatatable(annotatedName); + CsdlAnnotatable providerAnnotatable = provider.getAnnoatatable(annotatedName); if (providerAnnotatable != null && providerAnnotatable.getAnnotations() != null) { List<EdmAnnotation> result = new ArrayList<EdmAnnotation>(); - for(Annotation annotation : providerAnnotatable.getAnnotations()){ + for(CsdlAnnotation annotation : providerAnnotatable.getAnnotations()){ //Load Term getTerm(new FullQualifiedName(annotation.getTerm())); result.add(new EdmAnnotationImpl(this, annotation)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java index e0e8f85..7393499 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReferentialConstraintImpl.java @@ -20,13 +20,13 @@ package org.apache.olingo.commons.core.edm; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmReferentialConstraint; -import org.apache.olingo.commons.api.edm.provider.ReferentialConstraint; +import org.apache.olingo.commons.api.edm.provider.CsdlReferentialConstraint; public class EdmReferentialConstraintImpl extends AbstractEdmAnnotatable implements EdmReferentialConstraint { - private final ReferentialConstraint constraint; + private final CsdlReferentialConstraint constraint; - public EdmReferentialConstraintImpl(final Edm edm, final ReferentialConstraint constraint) { + public EdmReferentialConstraintImpl(final Edm edm, final CsdlReferentialConstraint constraint) { super(edm, constraint); this.constraint = constraint; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java index 04f6f90..efd58c8 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmReturnTypeImpl.java @@ -23,15 +23,15 @@ import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.ReturnType; +import org.apache.olingo.commons.api.edm.provider.CsdlReturnType; public class EdmReturnTypeImpl implements EdmReturnType { - private final ReturnType returnType; + private final CsdlReturnType returnType; private final EdmTypeInfo typeInfo; private EdmType typeImpl; - public EdmReturnTypeImpl(final Edm edm, final ReturnType returnType) { + public EdmReturnTypeImpl(final Edm edm, final CsdlReturnType returnType) { this.returnType = returnType; this.typeInfo = new EdmTypeInfo.Builder().setEdm(edm).setTypeExpression(returnType.getType()).build(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java index 5521b92..1c7bb4c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSchemaImpl.java @@ -34,23 +34,23 @@ import org.apache.olingo.commons.api.edm.EdmSchema; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Action; -import org.apache.olingo.commons.api.edm.provider.Annotation; -import org.apache.olingo.commons.api.edm.provider.Annotations; -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.EntityType; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.Schema; -import org.apache.olingo.commons.api.edm.provider.Term; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlAction; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotation; +import org.apache.olingo.commons.api.edm.provider.CsdlAnnotations; +import org.apache.olingo.commons.api.edm.provider.CsdlComplexType; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEntityType; +import org.apache.olingo.commons.api.edm.provider.CsdlEnumType; +import org.apache.olingo.commons.api.edm.provider.CsdlFunction; +import org.apache.olingo.commons.api.edm.provider.CsdlSchema; +import org.apache.olingo.commons.api.edm.provider.CsdlTerm; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; public class EdmSchemaImpl implements EdmSchema { - private final Schema schema; + private final CsdlSchema schema; private final EdmProviderImpl edm; - private final EdmProvider provider; + private final CsdlEdmProvider provider; protected final String namespace; private final String alias; @@ -65,7 +65,7 @@ public class EdmSchemaImpl implements EdmSchema { private List<EdmAnnotation> annotations; private EdmEntityContainer entityContainer; - public EdmSchemaImpl(final EdmProviderImpl edm, final EdmProvider provider, final Schema schema) { + public EdmSchemaImpl(final EdmProviderImpl edm, final CsdlEdmProvider provider, final CsdlSchema schema) { this.edm = edm; this.provider = provider; this.schema = schema; @@ -161,9 +161,9 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmTypeDefinition> createTypeDefinitions() { final List<EdmTypeDefinition> typeDefinitions = new ArrayList<EdmTypeDefinition>(); - final List<TypeDefinition> providerTypeDefinitions = schema.getTypeDefinitions(); + final List<CsdlTypeDefinition> providerTypeDefinitions = schema.getTypeDefinitions(); if (providerTypeDefinitions != null) { - for (TypeDefinition def : providerTypeDefinitions) { + for (CsdlTypeDefinition def : providerTypeDefinitions) { FullQualifiedName typeDefName = new FullQualifiedName(namespace, def.getName()); EdmTypeDefinitionImpl typeDefImpl = new EdmTypeDefinitionImpl(edm, typeDefName, def); typeDefinitions.add(typeDefImpl); @@ -175,9 +175,9 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmEnumType> createEnumTypes() { final List<EdmEnumType> enumTypes = new ArrayList<EdmEnumType>(); - final List<EnumType> providerEnumTypes = schema.getEnumTypes(); + final List<CsdlEnumType> providerEnumTypes = schema.getEnumTypes(); if (providerEnumTypes != null) { - for (EnumType enumType : providerEnumTypes) { + for (CsdlEnumType enumType : providerEnumTypes) { FullQualifiedName enumName = new FullQualifiedName(namespace, enumType.getName()); EdmEnumType enumTypeImpl = new EdmEnumTypeImpl(edm, enumName, enumType); enumTypes.add(enumTypeImpl); @@ -189,9 +189,9 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmEntityType> createEntityTypes() { final List<EdmEntityType> entityTypes = new ArrayList<EdmEntityType>(); - final List<EntityType> providerEntityTypes = schema.getEntityTypes(); + final List<CsdlEntityType> providerEntityTypes = schema.getEntityTypes(); if (providerEntityTypes != null) { - for (EntityType entityType : providerEntityTypes) { + for (CsdlEntityType entityType : providerEntityTypes) { FullQualifiedName entityTypeName = new FullQualifiedName(namespace, entityType.getName()); EdmEntityTypeImpl entityTypeImpl = new EdmEntityTypeImpl(edm, entityTypeName, entityType); entityTypes.add(entityTypeImpl); @@ -203,9 +203,9 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmComplexType> createComplexTypes() { final List<EdmComplexType> complexTypes = new ArrayList<EdmComplexType>(); - final List<ComplexType> providerComplexTypes = schema.getComplexTypes(); + final List<CsdlComplexType> providerComplexTypes = schema.getComplexTypes(); if (providerComplexTypes != null) { - for (ComplexType complexType : providerComplexTypes) { + for (CsdlComplexType complexType : providerComplexTypes) { FullQualifiedName comlexTypeName = new FullQualifiedName(namespace, complexType.getName()); EdmComplexTypeImpl complexTypeImpl = new EdmComplexTypeImpl(edm, comlexTypeName, complexType); complexTypes.add(complexTypeImpl); @@ -217,9 +217,9 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmAction> createActions() { final List<EdmAction> actions = new ArrayList<EdmAction>(); - final List<Action> providerActions = schema.getActions(); + final List<CsdlAction> providerActions = schema.getActions(); if (providerActions != null) { - for (Action action : providerActions) { + for (CsdlAction action : providerActions) { FullQualifiedName actionName = new FullQualifiedName(namespace, action.getName()); EdmActionImpl edmActionImpl = new EdmActionImpl(edm, actionName, action); actions.add(edmActionImpl); @@ -231,9 +231,9 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmFunction> createFunctions() { final List<EdmFunction> functions = new ArrayList<EdmFunction>(); - final List<Function> providerFunctions = schema.getFunctions(); + final List<CsdlFunction> providerFunctions = schema.getFunctions(); if (providerFunctions != null) { - for (Function function : providerFunctions) { + for (CsdlFunction function : providerFunctions) { FullQualifiedName functionName = new FullQualifiedName(namespace, function.getName()); EdmFunctionImpl functionImpl = new EdmFunctionImpl(edm, functionName, function); functions.add(functionImpl); @@ -245,9 +245,9 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmTerm> createTerms() { final List<EdmTerm> terms = new ArrayList<EdmTerm>(); - final List<Term> providerTerms = schema.getTerms(); + final List<CsdlTerm> providerTerms = schema.getTerms(); if (providerTerms != null) { - for (Term term : providerTerms) { + for (CsdlTerm term : providerTerms) { FullQualifiedName termName = new FullQualifiedName(namespace, term.getName()); EdmTermImpl termImpl = new EdmTermImpl(edm, getNamespace(), term); terms.add(termImpl); @@ -259,10 +259,10 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmAnnotations> createAnnotationGroups() { final List<EdmAnnotations> annotationGroups = new ArrayList<EdmAnnotations>(); - final List<Annotations> providerAnnotations = + final List<CsdlAnnotations> providerAnnotations = schema.getAnnotationGroups(); if (providerAnnotations != null) { - for (Annotations annotationGroup : providerAnnotations) { + for (CsdlAnnotations annotationGroup : providerAnnotations) { FullQualifiedName annotationsGroupName; if (annotationGroup.getTarget().contains(".")) { annotationsGroupName = new FullQualifiedName(annotationGroup.getTarget()); @@ -279,10 +279,10 @@ public class EdmSchemaImpl implements EdmSchema { protected List<EdmAnnotation> createAnnotations() { final List<EdmAnnotation> annotations = new ArrayList<EdmAnnotation>(); - final List<Annotation> providerAnnotations = + final List<CsdlAnnotation> providerAnnotations = schema.getAnnotations(); if (providerAnnotations != null) { - for (Annotation annotation : providerAnnotations) { + for (CsdlAnnotation annotation : providerAnnotations) { EdmAnnotationImpl annotationImpl = new EdmAnnotationImpl(edm, annotation); annotations.add(annotationImpl); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java index afb900f..c64a866 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonImpl.java @@ -21,11 +21,11 @@ package org.apache.olingo.commons.core.edm; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmSingleton; -import org.apache.olingo.commons.api.edm.provider.Singleton; +import org.apache.olingo.commons.api.edm.provider.CsdlSingleton; public class EdmSingletonImpl extends AbstractEdmBindingTarget implements EdmSingleton { - public EdmSingletonImpl(final Edm edm, final EdmEntityContainer container, final Singleton singleton) { + public EdmSingletonImpl(final Edm edm, final EdmEntityContainer container, final CsdlSingleton singleton) { super(edm, container, singleton); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java index 8d72c83..efda3a7 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTermImpl.java @@ -28,7 +28,7 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmType; 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.Term; +import org.apache.olingo.commons.api.edm.provider.CsdlTerm; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,14 +36,14 @@ import org.slf4j.LoggerFactory; public class EdmTermImpl extends AbstractEdmNamed implements EdmTerm { private static final Logger LOG = LoggerFactory.getLogger(EdmTermImpl.class); - private final Term term; + private final CsdlTerm term; private final FullQualifiedName fqn; private final EdmTypeInfo typeInfo; private EdmType termType; private EdmTerm baseTerm; private List<Class<?>> appliesTo; - public EdmTermImpl(final Edm edm, final String namespace, final Term term) { + public EdmTermImpl(final Edm edm, final String namespace, final CsdlTerm term) { super(edm, term.getName(), term); this.term = term; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java index b42f6c6..6e15f35 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeDefinitionImpl.java @@ -27,17 +27,17 @@ import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.geo.SRID; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.commons.api.edm.provider.CsdlTypeDefinition; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; public class EdmTypeDefinitionImpl extends AbstractEdmNamed implements EdmTypeDefinition { - private TypeDefinition typeDefinition; + private CsdlTypeDefinition typeDefinition; private FullQualifiedName typeDefinitionName; private EdmPrimitiveType edmPrimitiveTypeInstance; public EdmTypeDefinitionImpl(final Edm edm, final FullQualifiedName typeDefinitionName, - final TypeDefinition typeDefinition) { + final CsdlTypeDefinition typeDefinition) { super(edm, typeDefinitionName.getName(), typeDefinition); this.typeDefinitionName = typeDefinitionName; this.typeDefinition = typeDefinition; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java index 630146b..3b6f070 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeImpl.java @@ -22,7 +22,7 @@ import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmType; 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.CsdlAnnotatable; public class EdmTypeImpl extends AbstractEdmNamed implements EdmType { @@ -30,7 +30,7 @@ public class EdmTypeImpl extends AbstractEdmNamed implements EdmType { protected final EdmTypeKind kind; public EdmTypeImpl(final Edm edm, final FullQualifiedName typeName, final EdmTypeKind kind, - final Annotatable annotatable) { + final CsdlAnnotatable annotatable) { super(edm, typeName.getName(), annotatable); this.typeName = typeName; this.kind = kind; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/2318953c/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java index 1f6ff8e..767dd19 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java @@ -23,7 +23,7 @@ import java.util.List; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.server.api.deserializer.DeserializerException; import org.apache.olingo.server.api.deserializer.FixedFormatDeserializer; @@ -93,7 +93,7 @@ public abstract class OData { * @param edmProvider a custom or default implementation for creating metadata * @param references list of edmx references */ - public abstract ServiceMetadata createServiceMetadata(EdmProvider edmProvider, List<EdmxReference> references); + public abstract ServiceMetadata createServiceMetadata(CsdlEdmProvider edmProvider, List<EdmxReference> references); /** * Creates a new URI helper object for performing URI-related tasks.
