You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by il...@apache.org on 2014/03/07 10:09:44 UTC
[55/57] [abbrv] git commit: [OLINGO-169] client-api interface
refinements + proxy of Edm interfaces for V3 functionImport
[OLINGO-169] client-api interface refinements + proxy of Edm interfaces for V3 functionImport
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/1264aecd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/1264aecd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/1264aecd
Branch: refs/heads/master
Commit: 1264aecd5ce4ef5b2a1e947a3600795d60e2e29a
Parents: 5fc405b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Thu Mar 6 16:18:27 2014 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Thu Mar 6 16:18:27 2014 +0100
----------------------------------------------------------------------
.../client/api/UnsupportedInV3Exception.java | 31 ++++
.../client/api/edm/xml/AbstractAnnotations.java | 30 ----
.../client/api/edm/xml/BindingTarget.java | 29 ++++
.../client/api/edm/xml/CommonAnnotations.java | 26 ++++
.../client/api/edm/xml/CommonParameter.java | 10 --
.../client/api/edm/xml/CommonProperty.java | 24 ---
.../odata4/client/api/edm/xml/DataServices.java | 4 -
.../olingo/odata4/client/api/edm/xml/Edmx.java | 4 -
.../client/api/edm/xml/EntityContainer.java | 18 ---
.../odata4/client/api/edm/xml/EntityKey.java | 2 +-
.../odata4/client/api/edm/xml/EntitySet.java | 5 +-
.../odata4/client/api/edm/xml/EntityType.java | 10 --
.../odata4/client/api/edm/xml/EnumType.java | 6 +-
.../olingo/odata4/client/api/edm/xml/Named.java | 2 -
.../odata4/client/api/edm/xml/OnDelete.java | 4 -
.../client/api/edm/xml/OnDeleteAction.java | 28 ++++
.../odata4/client/api/edm/xml/PropertyRef.java | 1 -
.../odata4/client/api/edm/xml/Schema.java | 10 +-
.../client/api/edm/xml/v3/Annotations.java | 8 +-
.../client/api/edm/xml/v3/Association.java | 4 +-
.../client/api/edm/xml/v3/AssociationEnd.java | 8 -
.../client/api/edm/xml/v3/AssociationSet.java | 4 +-
.../api/edm/xml/v3/AssociationSetEnd.java | 4 -
.../client/api/edm/xml/v3/FunctionImport.java | 19 +--
.../api/edm/xml/v3/NavigationProperty.java | 5 -
.../odata4/client/api/edm/xml/v3/Parameter.java | 2 -
.../odata4/client/api/edm/xml/v3/Property.java | 12 --
.../client/api/edm/xml/v3/PropertyValue.java | 16 --
.../api/edm/xml/v3/ReferentialConstraint.java | 4 -
.../edm/xml/v3/ReferentialConstraintRole.java | 4 +-
.../client/api/edm/xml/v3/TypeAnnotation.java | 6 +-
.../odata4/client/api/edm/xml/v3/Using.java | 4 -
.../client/api/edm/xml/v3/ValueAnnotation.java | 18 ---
.../odata4/client/api/edm/xml/v3/ValueTerm.java | 2 -
.../odata4/client/api/edm/xml/v4/Action.java | 11 +-
.../client/api/edm/xml/v4/ActionImport.java | 2 -
.../client/api/edm/xml/v4/AnnotatedEdmItem.java | 2 -
.../client/api/edm/xml/v4/Annotation.java | 8 -
.../client/api/edm/xml/v4/Annotations.java | 4 +-
.../client/api/edm/xml/v4/BindingTarget.java | 31 ----
.../client/api/edm/xml/v4/ComplexType.java | 18 ++-
.../odata4/client/api/edm/xml/v4/Edmx.java | 2 +-
.../client/api/edm/xml/v4/EntityContainer.java | 27 ++--
.../odata4/client/api/edm/xml/v4/EntitySet.java | 4 +-
.../odata4/client/api/edm/xml/v4/Function.java | 2 -
.../client/api/edm/xml/v4/FunctionImport.java | 4 -
.../odata4/client/api/edm/xml/v4/Include.java | 4 -
.../api/edm/xml/v4/IncludeAnnotations.java | 6 -
.../api/edm/xml/v4/NavigationProperty.java | 12 +-
.../edm/xml/v4/NavigationPropertyBinding.java | 4 -
.../client/api/edm/xml/v4/OnDeleteAction.java | 28 ----
.../odata4/client/api/edm/xml/v4/Parameter.java | 2 -
.../odata4/client/api/edm/xml/v4/Reference.java | 8 +-
.../api/edm/xml/v4/ReferentialConstraint.java | 4 -
.../client/api/edm/xml/v4/ReturnType.java | 12 --
.../odata4/client/api/edm/xml/v4/Schema.java | 64 ++++++++
.../odata4/client/api/edm/xml/v4/Singleton.java | 4 +-
.../odata4/client/api/edm/xml/v4/Term.java | 23 +--
.../client/api/edm/xml/v4/TypeDefinition.java | 14 +-
.../client/core/edm/EdmActionImportImpl.java | 2 +-
.../client/core/edm/EdmBindingTargetImpl.java | 2 +-
.../odata4/client/core/edm/EdmClientImpl.java | 149 +++++++++++++++----
.../client/core/edm/EdmComplexTypeImpl.java | 10 +-
.../client/core/edm/EdmEntityContainerImpl.java | 49 ++++--
.../client/core/edm/EdmEntitySetImpl.java | 2 +-
.../client/core/edm/EdmFunctionImportImpl.java | 2 +-
.../client/core/edm/EdmOperationImpl.java | 11 +-
.../client/core/edm/EdmOperationImportImpl.java | 5 +-
.../core/edm/v3/EdmActionImportProxy.java | 45 ++++++
.../client/core/edm/v3/EdmActionProxy.java | 39 +++++
.../core/edm/v3/EdmFunctionImportProxy.java | 47 ++++++
.../client/core/edm/v3/EdmFunctionProxy.java | 43 ++++++
.../client/core/edm/v3/EdmOperationProxy.java | 64 ++++++++
.../core/edm/v3/EdmServiceMetadataImpl.java | 6 +-
.../client/core/edm/v3/ReturnTypeProxy.java | 62 ++++++++
.../core/edm/xml/AbstractAnnotations.java | 4 +-
.../core/edm/xml/AbstractComplexType.java | 1 -
.../core/edm/xml/AbstractDataServices.java | 2 -
.../client/core/edm/xml/AbstractEdmx.java | 2 -
.../core/edm/xml/AbstractEntityContainer.java | 6 +-
.../client/core/edm/xml/AbstractEntitySet.java | 2 -
.../client/core/edm/xml/AbstractEntityType.java | 4 -
.../client/core/edm/xml/AbstractEnumType.java | 13 +-
.../edm/xml/AbstractNavigationProperty.java | 1 -
.../client/core/edm/xml/AbstractParameter.java | 6 -
.../client/core/edm/xml/AbstractProperty.java | 13 +-
.../client/core/edm/xml/AbstractSchema.java | 2 -
.../client/core/edm/xml/EntityKeyImpl.java | 5 +-
.../client/core/edm/xml/OnDeleteImpl.java | 3 +-
.../client/core/edm/xml/PropertyRefImpl.java | 2 -
.../client/core/edm/xml/v3/AnnotationsImpl.java | 10 +-
.../core/edm/xml/v3/AssociationEndImpl.java | 4 -
.../client/core/edm/xml/v3/AssociationImpl.java | 7 +-
.../core/edm/xml/v3/AssociationSetEndImpl.java | 2 -
.../core/edm/xml/v3/AssociationSetImpl.java | 7 +-
.../core/edm/xml/v3/DataServicesImpl.java | 5 +-
.../core/edm/xml/v3/EntityContainerImpl.java | 19 ++-
.../client/core/edm/xml/v3/EntitySetImpl.java | 8 +
.../client/core/edm/xml/v3/EnumTypeImpl.java | 15 +-
.../core/edm/xml/v3/FunctionImportImpl.java | 14 +-
.../core/edm/xml/v3/NavigationPropertyImpl.java | 3 -
.../client/core/edm/xml/v3/ParameterImpl.java | 1 -
.../client/core/edm/xml/v3/PropertyImpl.java | 6 -
.../core/edm/xml/v3/PropertyValueImpl.java | 12 +-
.../edm/xml/v3/ReferentialConstraintImpl.java | 2 -
.../xml/v3/ReferentialConstraintRoleImpl.java | 7 +-
.../client/core/edm/xml/v3/SchemaImpl.java | 56 ++++---
.../core/edm/xml/v3/TypeAnnotationImpl.java | 7 +-
.../client/core/edm/xml/v3/UsingImpl.java | 2 -
.../core/edm/xml/v3/ValueAnnotationImpl.java | 9 --
.../client/core/edm/xml/v3/ValueTermImpl.java | 2 -
.../client/core/edm/xml/v3/XMLMetadataImpl.java | 17 ---
.../edm/xml/v4/AbstractAnnotatedEdmItem.java | 1 -
.../client/core/edm/xml/v4/ActionImpl.java | 18 +--
.../core/edm/xml/v4/ActionImportImpl.java | 2 -
.../client/core/edm/xml/v4/AnnotationImpl.java | 18 +--
.../client/core/edm/xml/v4/ComplexTypeImpl.java | 30 ++--
.../core/edm/xml/v4/DataServicesImpl.java | 5 +-
.../odata4/client/core/edm/xml/v4/EdmxImpl.java | 5 +-
.../core/edm/xml/v4/EntityContainerImpl.java | 45 +++---
.../client/core/edm/xml/v4/EntitySetImpl.java | 8 +-
.../client/core/edm/xml/v4/EntityTypeImpl.java | 25 ++--
.../client/core/edm/xml/v4/EnumTypeImpl.java | 26 +---
.../client/core/edm/xml/v4/FunctionImpl.java | 1 -
.../core/edm/xml/v4/FunctionImportImpl.java | 10 +-
.../core/edm/xml/v4/IncludeAnnotationsImpl.java | 3 -
.../client/core/edm/xml/v4/IncludeImpl.java | 2 -
.../client/core/edm/xml/v4/MemberImpl.java | 7 +-
.../xml/v4/NavigationPropertyBindingImpl.java | 2 -
.../core/edm/xml/v4/NavigationPropertyImpl.java | 24 ++-
.../client/core/edm/xml/v4/ParameterImpl.java | 1 -
.../client/core/edm/xml/v4/PropertyImpl.java | 7 +-
.../client/core/edm/xml/v4/ReferenceImpl.java | 11 +-
.../edm/xml/v4/ReferentialConstraintImpl.java | 2 -
.../client/core/edm/xml/v4/ReturnTypeImpl.java | 6 -
.../client/core/edm/xml/v4/SchemaImpl.java | 105 +++++++------
.../client/core/edm/xml/v4/SingletonImpl.java | 2 -
.../core/edm/xml/v4/TermDeserializer.java | 7 +-
.../odata4/client/core/edm/xml/v4/TermImpl.java | 28 ++--
.../core/edm/xml/v4/TypeDefinitionImpl.java | 12 +-
.../client/core/edm/xml/v4/XMLMetadataImpl.java | 21 ++-
.../annotation/AnnotatedDynExprConstruct.java | 8 +-
.../odata4/client/core/v3/MetadataTest.java | 115 ++++++++------
.../odata4/client/core/v4/MetadataTest.java | 42 +++---
144 files changed, 1088 insertions(+), 994 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java
new file mode 100644
index 0000000..71dd6c2
--- /dev/null
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/UnsupportedInV3Exception.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.odata4.client.api;
+
+import org.apache.olingo.odata4.commons.api.edm.EdmException;
+
+public class UnsupportedInV3Exception extends EdmException {
+
+ private static final long serialVersionUID = 4773734640262424651L;
+
+ public UnsupportedInV3Exception() {
+ super("Not supported in OData 3.0");
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/AbstractAnnotations.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/AbstractAnnotations.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/AbstractAnnotations.java
deleted file mode 100644
index 76bf4d6..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/AbstractAnnotations.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.api.edm.xml;
-
-public abstract interface AbstractAnnotations {
-
- String getTarget();
-
- void setTarget(String target);
-
- String getQualifier();
-
- void setQualifier(String qualifier);
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/BindingTarget.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/BindingTarget.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/BindingTarget.java
new file mode 100644
index 0000000..c996f71
--- /dev/null
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/BindingTarget.java
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.odata4.client.api.edm.xml;
+
+import java.util.List;
+import org.apache.olingo.odata4.client.api.edm.xml.v4.NavigationPropertyBinding;
+
+public interface BindingTarget extends Named {
+
+ String getEntityType();
+
+ List<? extends NavigationPropertyBinding> getNavigationPropertyBindings();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java
new file mode 100644
index 0000000..ddee303
--- /dev/null
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonAnnotations.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.odata4.client.api.edm.xml;
+
+public abstract interface CommonAnnotations {
+
+ String getTarget();
+
+ String getQualifier();
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java
index 6d39a8d..30aef72 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonParameter.java
@@ -22,22 +22,12 @@ public interface CommonParameter extends Named {
String getType();
- void setType(String type);
-
boolean isNullable();
- void setNullable(boolean nullable);
-
Integer getMaxLength();
- void setMaxLength(Integer maxLength);
-
Integer getPrecision();
- void setPrecision(Integer precision);
-
Integer getScale();
- void setScale(Integer scale);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java
index cc362a5..7f51af7 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/CommonProperty.java
@@ -25,49 +25,25 @@ public interface CommonProperty extends Named {
String getType();
- void setType(String type);
-
boolean isNullable();
- void setNullable(boolean nullable);
-
String getDefaultValue();
- void setDefaultValue(String defaultValue);
-
Integer getMaxLength();
- void setMaxLength(Integer maxLength);
-
boolean isFixedLength();
- void setFixedLength(boolean fixedLength);
-
Integer getPrecision();
- void setPrecision(Integer precision);
-
Integer getScale();
- void setScale(Integer scale);
-
boolean isUnicode();
- void setUnicode(boolean unicode);
-
String getCollation();
- void setCollation(String collation);
-
String getSrid();
- void setSrid(String srid);
-
ConcurrencyMode getConcurrencyMode();
- void setConcurrencyMode(ConcurrencyMode concurrencyMode);
-
StoreGeneratedPattern getStoreGeneratedPattern();
-
- void setStoreGeneratedPattern(StoreGeneratedPattern storeGeneratedPattern);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java
index b4b4c95..f05c352 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/DataServices.java
@@ -24,11 +24,7 @@ public interface DataServices {
String getDataServiceVersion();
- void setDataServiceVersion(String version);
-
String getMaxDataServiceVersion();
- void setMaxDataServiceVersion(String version);
-
List<? extends Schema> getSchemas();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java
index e90bb85..0ab3d7a 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Edmx.java
@@ -22,9 +22,5 @@ public interface Edmx {
String getVersion();
- void setVersion(String version);
-
DataServices getDataServices();
-
- void setDataServices(DataServices dataServices);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java
index 73714a5..53f7e09 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityContainer.java
@@ -24,34 +24,16 @@ public interface EntityContainer extends Named {
String getExtends();
- void setExtends(String _extends);
-
boolean isLazyLoadingEnabled();
- void setLazyLoadingEnabled(boolean lazyLoadingEnabled);
-
boolean isDefaultEntityContainer();
- void setDefaultEntityContainer(boolean defaultEntityContainer);
-
EntitySet getEntitySet(String name);
List<? extends EntitySet> getEntitySets();
- /**
- * Gets the first function import with given name.
- *
- * @param name name.
- * @return function import.
- */
CommonFunctionImport getFunctionImport(String name);
- /**
- * Gets all function imports with given name.
- *
- * @param name name.
- * @return function imports.
- */
List<? extends CommonFunctionImport> getFunctionImports(String name);
List<? extends CommonFunctionImport> getFunctionImports();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java
index 1a6447e..cc3ab6e 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityKey.java
@@ -22,5 +22,5 @@ import java.util.List;
public interface EntityKey {
- List<? extends PropertyRef> getPropertyRefs();
+ List<PropertyRef> getPropertyRefs();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java
index 558b634..659480b 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntitySet.java
@@ -18,9 +18,6 @@
*/
package org.apache.olingo.odata4.client.api.edm.xml;
-public interface EntitySet extends Named {
+public interface EntitySet extends BindingTarget {
- String getEntityType();
-
- void setEntityType(String entityType);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java
index d3ef1a7..d2e3c6d 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EntityType.java
@@ -22,21 +22,11 @@ public interface EntityType extends ComplexType {
boolean isAbstractEntityType();
- void setAbstractEntityType(boolean abstractEntityType);
-
String getBaseType();
- void setBaseType(String baseType);
-
boolean isOpenType();
- void setOpenType(boolean openType);
-
EntityKey getKey();
- void setKey(EntityKey key);
-
boolean isHasStream();
-
- void setHasStream(boolean hasStream);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java
index 15f81c7..8e2628a 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/EnumType.java
@@ -24,13 +24,9 @@ public interface EnumType extends Named {
String getUnderlyingType();
- void setUnderlyingType(String underlyingType);
-
boolean isFlags();
- void setFlags(boolean flags);
-
- List<? extends Member> getMembers();
+ List<Member> getMembers();
Member getMember(String name);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java
index 89b4225..00a0e31 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Named.java
@@ -21,6 +21,4 @@ package org.apache.olingo.odata4.client.api.edm.xml;
public interface Named {
String getName();
-
- void setName(String name);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java
index 69ca408..7f48979 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDelete.java
@@ -18,11 +18,7 @@
*/
package org.apache.olingo.odata4.client.api.edm.xml;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.OnDeleteAction;
-
public interface OnDelete {
OnDeleteAction getAction();
-
- void setAction(OnDeleteAction action);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java
new file mode 100644
index 0000000..3479707
--- /dev/null
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/OnDeleteAction.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.odata4.client.api.edm.xml;
+
+public enum OnDeleteAction {
+
+ Cascade,
+ None,
+ SetNull,
+ SetDefault;
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java
index e8c800f..49f0430 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/PropertyRef.java
@@ -22,5 +22,4 @@ public interface PropertyRef extends Named {
String getAlias();
- void setAlias(String alias);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java
index 8229234..42dc701 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/Schema.java
@@ -24,21 +24,17 @@ public interface Schema {
String getNamespace();
- void setNamespace(String namespace);
-
String getAlias();
- void setAlias(String alias);
-
List<? extends EntityType> getEntityTypes();
- List<? extends EnumType> getEnumTypes();
+ List<EnumType> getEnumTypes();
EnumType getEnumType(String name);
- List<? extends AbstractAnnotations> getAnnotationsList();
+ List<? extends CommonAnnotations> getAnnotationsList();
- AbstractAnnotations getAnnotationsList(String target);
+ CommonAnnotations getAnnotationsList(String target);
List<? extends ComplexType> getComplexTypes();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java
index 07f2349..03bdbe7 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Annotations.java
@@ -19,11 +19,11 @@
package org.apache.olingo.odata4.client.api.edm.xml.v3;
import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.AbstractAnnotations;
+import org.apache.olingo.odata4.client.api.edm.xml.CommonAnnotations;
-public interface Annotations extends AbstractAnnotations {
+public interface Annotations extends CommonAnnotations {
- List<? extends TypeAnnotation> getTypeAnnotations();
+ List<TypeAnnotation> getTypeAnnotations();
- List<? extends ValueAnnotation> getValueAnnotations();
+ List<ValueAnnotation> getValueAnnotations();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java
index 06c9566..d306125 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Association.java
@@ -25,8 +25,6 @@ public interface Association extends Named {
ReferentialConstraint getReferentialConstraint();
- void setReferentialConstraint(ReferentialConstraint referentialConstraint);
-
- List<? extends AssociationEnd> getEnds();
+ List<AssociationEnd> getEnds();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java
index 6320ac6..1f249a8 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationEnd.java
@@ -24,17 +24,9 @@ public interface AssociationEnd {
String getType();
- void setType(String type);
-
String getRole();
- void setRole(String role);
-
String getMultiplicity();
- void setMultiplicity(String multiplicity);
-
OnDelete getOnDelete();
-
- void setOnDelete(OnDelete onDelete);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java
index eb9ebb9..5963a0c 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSet.java
@@ -25,7 +25,5 @@ public interface AssociationSet extends Named {
String getAssociation();
- void setAssociation(String association);
-
- List<? extends AssociationSetEnd> getEnds();
+ List<AssociationSetEnd> getEnds();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java
index fa7a111..891ba6c 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/AssociationSetEnd.java
@@ -22,9 +22,5 @@ public interface AssociationSetEnd {
String getRole();
- void setRole(String role);
-
String getEntitySet();
-
- void setEntitySet(String entitySet);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java
index 99f39ee..ccc733e 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/FunctionImport.java
@@ -19,42 +19,25 @@
package org.apache.olingo.odata4.client.api.edm.xml.v3;
import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.CommonParameter;
public interface FunctionImport extends org.apache.olingo.odata4.client.api.edm.xml.CommonFunctionImport {
String getReturnType();
- void setReturnType(String returnType);
-
String getEntitySet();
- void setEntitySet(String entitySet);
-
String getEntitySetPath();
- void setEntitySetPath(String entitySetPath);
-
boolean isComposable();
- void setComposable(boolean composable);
-
boolean isSideEffecting();
- void setSideEffecting(boolean sideEffecting);
-
boolean isBindable();
- void setBindable(boolean bindable);
-
boolean isAlwaysBindable();
- void setAlwaysBindable(boolean alwaysBindable);
-
String getHttpMethod();
- void setHttpMethod(String httpMethod);
-
- List<? extends CommonParameter> getParameters();
+ List<Parameter> getParameters();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java
index 921c600..f1f5ce0 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/NavigationProperty.java
@@ -22,13 +22,8 @@ public interface NavigationProperty extends org.apache.olingo.odata4.client.api.
String getRelationship();
- void setRelationship(String relationship);
-
String getToRole();
- void setToRole(String toRole);
-
String getFromRole();
- void setFromRole(String fromRole);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java
index f624f7f..8fcbc4b 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Parameter.java
@@ -21,6 +21,4 @@ package org.apache.olingo.odata4.client.api.edm.xml.v3;
public interface Parameter extends org.apache.olingo.odata4.client.api.edm.xml.CommonParameter {
ParameterMode getMode();
-
- void setMode(ParameterMode mode);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java
index 0eb9fda..950e562 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Property.java
@@ -25,26 +25,14 @@ public interface Property extends CommonProperty {
String getFcSourcePath();
- void setFcSourcePath(String fcSourcePath);
-
String getFcTargetPath();
- void setFcTargetPath(String fcTargetPath);
-
EdmContentKind getFcContentKind();
- void setFcContentKind(EdmContentKind fcContentKind);
-
String getFcNSPrefix();
- void setFcNSPrefix(String fcNSPrefix);
-
String getFcNSURI();
- void setFcNSURI(String fcNSURI);
-
boolean isFcKeepInContent();
- void setFcKeepInContent(boolean fcKeepInContent);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java
index 6da96a2..08fcb5c 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/PropertyValue.java
@@ -26,34 +26,18 @@ public interface PropertyValue {
String getProperty();
- void setProperty(String property);
-
String getPath();
- void setPath(String path);
-
String getString();
- void setString(String string);
-
BigInteger getInt();
- void setInt(BigInteger _int);
-
Double getFloat();
- void setFloat(Double _float);
-
BigDecimal getDecimal();
- void setDecimal(BigDecimal decimal);
-
Boolean getBool();
- void setBool(Boolean bool);
-
Date getDateTime();
- void setDateTime(Date dateTime);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java
index 1e8e55a..6448304 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraint.java
@@ -22,9 +22,5 @@ public interface ReferentialConstraint {
ReferentialConstraintRole getPrincipal();
- void setPrincipal(ReferentialConstraintRole principal);
-
ReferentialConstraintRole getDependent();
-
- void setDependent(ReferentialConstraintRole dependent);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java
index 198bdb7..a47eb58 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ReferentialConstraintRole.java
@@ -25,8 +25,6 @@ public interface ReferentialConstraintRole {
String getRole();
- void setRole(final String role);
-
- List<? extends PropertyRef> getPropertyRefs();
+ List<PropertyRef> getPropertyRefs();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java
index ead3239..5b4792c 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/TypeAnnotation.java
@@ -24,12 +24,8 @@ public interface TypeAnnotation {
String getTerm();
- void setTerm(String term);
-
String getQualifier();
- void setQualifier(String qualifier);
-
- List<? extends PropertyValue> getPropertyValues();
+ List<PropertyValue> getPropertyValues();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java
index 541d32a..db69189 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/Using.java
@@ -22,10 +22,6 @@ public interface Using {
String getNamespace();
- void setNamespace(String namespace);
-
String getAlias();
- void setAlias(String alias);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java
index 799f982..9f779ef 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueAnnotation.java
@@ -42,22 +42,4 @@ public interface ValueAnnotation {
String getTerm();
- void setBool(Boolean bool);
-
- void setDateTime(Date dateTime);
-
- void setDecimal(BigDecimal decimal);
-
- void setFloat(Double _float);
-
- void setInt(BigInteger _int);
-
- void setPath(String path);
-
- void setQualifier(String qualifier);
-
- void setString(String string);
-
- void setTerm(String term);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java
index cefba08..9180086 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v3/ValueTerm.java
@@ -23,6 +23,4 @@ import org.apache.olingo.odata4.client.api.edm.xml.Named;
public interface ValueTerm extends Named {
String getType();
-
- void setType(String type);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java
index 0828304..5fb82d1 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Action.java
@@ -20,24 +20,17 @@ package org.apache.olingo.odata4.client.api.edm.xml.v4;
import java.util.List;
import org.apache.olingo.odata4.client.api.edm.xml.Named;
-import org.apache.olingo.odata4.client.api.edm.xml.CommonParameter;
public interface Action extends Named {
boolean isBound();
- void setBound(boolean bound);
-
String getEntitySetPath();
- void setEntitySetPath(String entitySetPath);
-
- List<? extends CommonParameter> getParameters();
+ List<Parameter> getParameters();
- CommonParameter getParameter(String name);
+ Parameter getParameter(String name);
ReturnType getReturnType();
- void setReturnType(ReturnType returnType);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java
index a2d8824..5338737 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ActionImport.java
@@ -21,6 +21,4 @@ package org.apache.olingo.odata4.client.api.edm.xml.v4;
public interface ActionImport extends OperationImport {
String getAction();
-
- void setAction(String action);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java
index b185b0f..484a830 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/AnnotatedEdmItem.java
@@ -21,6 +21,4 @@ package org.apache.olingo.odata4.client.api.edm.xml.v4;
public interface AnnotatedEdmItem {
Annotation getAnnotation();
-
- void setAnnotation(Annotation annotation);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java
index c181625..b7e237f 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotation.java
@@ -25,17 +25,9 @@ public interface Annotation {
String getTerm();
- void setTerm(String term);
-
String getQualifier();
- void setQualifier(String qualifier);
-
ConstExprConstruct getConstExpr();
- void setConstExpr(ConstExprConstruct constExpr);
-
DynExprConstruct getDynExpr();
-
- void setDynExpr(DynExprConstruct dynExpr);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java
index fa5ef64..2f3e0aa 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Annotations.java
@@ -19,9 +19,9 @@
package org.apache.olingo.odata4.client.api.edm.xml.v4;
import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.AbstractAnnotations;
+import org.apache.olingo.odata4.client.api.edm.xml.CommonAnnotations;
-public interface Annotations extends AbstractAnnotations {
+public interface Annotations extends CommonAnnotations {
List<? extends Annotation> getAnnotations();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java
deleted file mode 100644
index c2c4aba..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/BindingTarget.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
-
-import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.Named;
-
-public interface BindingTarget extends Named, AnnotatedEdmItem {
-
- String getEntityType();
-
- void setEntityType(String entityType);
-
- List<? extends NavigationPropertyBinding> getNavigationPropertyBindings();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java
index 8724462..7515ce9 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ComplexType.java
@@ -18,18 +18,26 @@
*/
package org.apache.olingo.odata4.client.api.edm.xml.v4;
+import java.util.List;
+
public interface ComplexType extends org.apache.olingo.odata4.client.api.edm.xml.ComplexType, AnnotatedEdmItem {
boolean isAbstractEntityType();
- void setAbstractEntityType(boolean abstractEntityType);
-
String getBaseType();
- void setBaseType(String baseType);
-
boolean isOpenType();
- void setOpenType(boolean openType);
+ @Override
+ Property getProperty(String name);
+
+ @Override
+ List<Property> getProperties();
+
+ @Override
+ NavigationProperty getNavigationProperty(String name);
+
+ @Override
+ List<NavigationProperty> getNavigationProperties();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java
index af0d85f..2f2f609 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Edmx.java
@@ -22,5 +22,5 @@ import java.util.List;
public interface Edmx extends org.apache.olingo.odata4.client.api.edm.xml.Edmx {
- List<? extends Reference> getReferences();
+ List<Reference> getReferences();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java
index d3a7611..6ed0846 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntityContainer.java
@@ -22,26 +22,23 @@ import java.util.List;
public interface EntityContainer extends org.apache.olingo.odata4.client.api.edm.xml.EntityContainer {
- List<? extends Singleton> getSingletons();
+ EntitySet getEntitySet(String name);
+
+ List<EntitySet> getEntitySets();
+
+ List<Singleton> getSingletons();
Singleton getSingleton(String name);
- /**
- * Gets the first action import with given name.
- *
- * @param name name.
- * @return action import.
- */
ActionImport getActionImport(String name);
- /**
- * Gets all action imports with given name.
- *
- * @param name name.
- * @return action imports.
- */
- List<? extends ActionImport> getActionImports(String name);
+ List<ActionImport> getActionImports(String name);
+
+ List<ActionImport> getActionImports();
+
+ FunctionImport getFunctionImport(String name);
- List<? extends ActionImport> getActionImports();
+ List<FunctionImport> getFunctionImports(String name);
+ List<FunctionImport> getFunctionImports();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java
index abdd598..a48b358 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/EntitySet.java
@@ -18,9 +18,7 @@
*/
package org.apache.olingo.odata4.client.api.edm.xml.v4;
-public interface EntitySet extends org.apache.olingo.odata4.client.api.edm.xml.EntitySet, BindingTarget {
+public interface EntitySet extends org.apache.olingo.odata4.client.api.edm.xml.EntitySet, AnnotatedEdmItem {
boolean isIncludeInServiceDocument();
-
- void setIncludeInServiceDocument(boolean includeInServiceDocument);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java
index 60f1491..7662a2a 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Function.java
@@ -21,6 +21,4 @@ package org.apache.olingo.odata4.client.api.edm.xml.v4;
public interface Function extends Action {
boolean isComposable();
-
- void setComposable(boolean composable);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java
index 1c243cd..bae6a10 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/FunctionImport.java
@@ -24,9 +24,5 @@ public interface FunctionImport extends OperationImport, CommonFunctionImport {
String getFunction();
- void setFunction(String function);
-
boolean isIncludeInServiceDocument();
-
- void setIncludeInServiceDocument(boolean includeInServiceDocument);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java
index d31916c..e75f589 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Include.java
@@ -23,8 +23,4 @@ public interface Include {
String getAlias();
String getNamespace();
-
- void setAlias(final String alias);
-
- void setNamespace(final String namespace);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java
index 484f644..0f25c35 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/IncludeAnnotations.java
@@ -25,10 +25,4 @@ public interface IncludeAnnotations {
String getTargeyNamespace();
String getTermNamespace();
-
- void setQualifier(String qualifier);
-
- void setTargeyNamespace(String targeyNamespace);
-
- void setTermNamespace(String termNamespace);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java
index d544b4a..d8d028d 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationProperty.java
@@ -26,24 +26,14 @@ public interface NavigationProperty
String getType();
- void setType(String type);
-
boolean isNullable();
- void setNullable(boolean nullable);
-
String getPartner();
- void setPartner(String partner);
-
boolean isContainsTarget();
- void setContainsTarget(boolean containsTarget);
-
- List<? extends ReferentialConstraint> getReferentialConstraints();
+ List<ReferentialConstraint> getReferentialConstraints();
OnDelete getOnDelete();
- void setOnDelete(OnDelete onDelete);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java
index 565e2c4..6a4d460 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/NavigationPropertyBinding.java
@@ -22,10 +22,6 @@ public interface NavigationPropertyBinding {
String getPath();
- void setPath(String path);
-
String getTarget();
- void setTarget(String target);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OnDeleteAction.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OnDeleteAction.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OnDeleteAction.java
deleted file mode 100644
index bf789cf..0000000
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/OnDeleteAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.odata4.client.api.edm.xml.v4;
-
-public enum OnDeleteAction {
-
- Cascade,
- None,
- SetNull,
- SetDefault;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java
index e5afe45..3a96af3 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Parameter.java
@@ -21,6 +21,4 @@ package org.apache.olingo.odata4.client.api.edm.xml.v4;
public interface Parameter extends org.apache.olingo.odata4.client.api.edm.xml.CommonParameter {
String getSrid();
-
- void setSrid(final String srid);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java
index d16e4e5..79f76e2 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Reference.java
@@ -25,11 +25,9 @@ public interface Reference {
URI getUri();
- void setUri(URI uri);
+ List<Include> getIncludes();
- List<? extends Include> getIncludes();
+ List<IncludeAnnotations> getIncludeAnnotations();
- List<? extends IncludeAnnotations> getIncludeAnnotations();
-
- List<? extends Annotation> getAnnotations();
+ List<Annotation> getAnnotations();
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java
index 6a06a65..f0063d2 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReferentialConstraint.java
@@ -22,10 +22,6 @@ public interface ReferentialConstraint {
String getProperty();
- void setProperty(String property);
-
String getReferencedProperty();
- void setReferencedProperty(String referencedProperty);
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java
index b6cd912..0157dc4 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/ReturnType.java
@@ -31,16 +31,4 @@ public interface ReturnType {
String getType();
boolean isNullable();
-
- void setMaxLength(Integer maxLength);
-
- void setNullable(boolean nullable);
-
- void setPrecision(Integer precision);
-
- void setScale(Integer scale);
-
- void setSrid(String srid);
-
- void setType(String type);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java
new file mode 100644
index 0000000..bfccae2
--- /dev/null
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Schema.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.olingo.odata4.client.api.edm.xml.v4;
+
+import java.util.List;
+
+public interface Schema extends org.apache.olingo.odata4.client.api.edm.xml.Schema, AnnotatedEdmItem {
+
+ @Override
+ List<EntityContainer> getEntityContainers();
+
+ EntityContainer getEntityContainer();
+
+ @Override
+ ComplexType getComplexType(String name);
+
+ @Override
+ List<ComplexType> getComplexTypes();
+
+ @Override
+ EntityType getEntityType(String name);
+
+ @Override
+ List<EntityType> getEntityTypes();
+
+ List<Action> getActions();
+
+ List<Action> getActions(String name);
+
+ List<Annotation> getAnnotations();
+
+ List<Function> getFunctions();
+
+ List<Function> getFunctions(String name);
+
+ List<Term> getTerms();
+
+ TypeDefinition getTypeDefinition(String name);
+
+ List<TypeDefinition> getTypeDefinitions();
+
+ @Override
+ List<Annotations> getAnnotationsList();
+
+ @Override
+ Annotations getAnnotationsList(String target);
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java
index 41145e5..589ee9f 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Singleton.java
@@ -18,8 +18,8 @@
*/
package org.apache.olingo.odata4.client.api.edm.xml.v4;
-import org.apache.olingo.odata4.client.api.edm.xml.Named;
+import org.apache.olingo.odata4.client.api.edm.xml.BindingTarget;
-public interface Singleton extends Named, BindingTarget {
+public interface Singleton extends BindingTarget, AnnotatedEdmItem {
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java
index e3b32ac..86e6a3f 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/Term.java
@@ -18,7 +18,6 @@
*/
package org.apache.olingo.odata4.client.api.edm.xml.v4;
-import java.math.BigInteger;
import java.util.List;
import org.apache.olingo.odata4.client.api.edm.xml.Named;
@@ -30,31 +29,15 @@ public interface Term extends Named {
String getDefaultValue();
- String getMaxLength();
+ Integer getMaxLength();
- BigInteger getPrecision();
+ Integer getPrecision();
- BigInteger getScale();
+ Integer getScale();
String getSrid();
String getType();
boolean isNullable();
-
- void setBaseTerm(String baseTerm);
-
- void setDefaultValue(String defaultValue);
-
- void setMaxLength(String maxLength);
-
- void setNullable(boolean nullable);
-
- void setPrecision(BigInteger precision);
-
- void setScale(BigInteger scale);
-
- void setSrid(String srid);
-
- void setType(String type);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java
index 05e8514..424a502 100644
--- a/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java
+++ b/odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/edm/xml/v4/TypeDefinition.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata4.client.api.edm.xml.Named;
public interface TypeDefinition extends Named {
- List<? extends Annotation> getAnnotations();
+ List<Annotation> getAnnotations();
Integer getMaxLength();
@@ -36,16 +36,4 @@ public interface TypeDefinition extends Named {
String getUnderlyingType();
boolean isUnicode();
-
- void setMaxLength(Integer maxLength);
-
- void setPrecision(Integer precision);
-
- void setScale(Integer scale);
-
- void setSrid(String srid);
-
- void setUnderlyingType(String underlyingType);
-
- void setUnicode(boolean unicode);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java
index a133578..1af0f47 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmActionImportImpl.java
@@ -32,7 +32,7 @@ public class EdmActionImportImpl extends EdmOperationImportImpl implements EdmAc
public EdmActionImportImpl(final Edm edm, final EdmEntityContainer container, final String name,
final ActionImport actionImport) {
- super(edm, container, name, actionImport);
+ super(edm, container, name, actionImport.getEntitySet());
this.actionImport = actionImport;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/1264aecd/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java
index 26f70e9..d27260b 100644
--- a/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java
+++ b/odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/edm/EdmBindingTargetImpl.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata4.client.core.edm;
import java.util.Iterator;
import java.util.List;
-import org.apache.olingo.odata4.client.api.edm.xml.v4.BindingTarget;
+import org.apache.olingo.odata4.client.api.edm.xml.BindingTarget;
import org.apache.olingo.odata4.client.api.edm.xml.v4.NavigationPropertyBinding;
import org.apache.olingo.odata4.commons.api.edm.Edm;
import org.apache.olingo.odata4.commons.api.edm.EdmBindingTarget;