You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/03/10 10:02:23 UTC
[07/51] [abbrv] [partial] [OLINGO-192] rename java packages
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java
deleted file mode 100644
index dec7584..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EntityType.java
+++ /dev/null
@@ -1,84 +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.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class EntityType extends StructuredType {
-
- private List<PropertyRef> key;
-
- private boolean hasStream;
-
- public boolean hasStream() {
- return hasStream;
- }
-
- public EntityType setHasStream(final boolean hasStream) {
- this.hasStream = hasStream;
- return this;
- }
-
- public List<PropertyRef> getKey() {
- return key;
- }
-
- public EntityType setKey(final List<PropertyRef> key) {
- this.key = key;
- return this;
- }
-
- @Override
- public EntityType setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public EntityType setOpenType(final boolean isOpenType) {
- this.isOpenType = isOpenType;
- return this;
- }
-
- @Override
- public EntityType setBaseType(final FullQualifiedName baseType) {
- this.baseType = baseType;
- return this;
- }
-
- @Override
- public EntityType setAbstract(final boolean isAbstract) {
- this.isAbstract = isAbstract;
- return this;
- }
-
- @Override
- public EntityType setProperties(final List<Property> properties) {
- this.properties = properties;
- return this;
- }
-
- @Override
- public EntityType setNavigationProperties(final List<NavigationProperty> navigationProperties) {
- this.navigationProperties = navigationProperties;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java
deleted file mode 100644
index 83870c9..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumMember.java
+++ /dev/null
@@ -1,49 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmMember;
-
-public class EnumMember implements EdmMember {
-
- private String name;
-
- private String value;
-
- // Annotations?
- @Override
- public String getName() {
- return name;
- }
-
- public EnumMember setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public String getValue() {
- return value;
- }
-
- public EnumMember setValue(final String value) {
- this.value = value;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java
deleted file mode 100644
index 6f83f35..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/EnumType.java
+++ /dev/null
@@ -1,73 +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.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class EnumType {
-
- private String name;
-
- private boolean isFlags;
-
- // Underlying Type can only be primitve...
- private FullQualifiedName underlyingType;
-
- private List<EnumMember> members;
-
- // Facets
- // Annotations?
- public String getName() {
- return name;
- }
-
- public EnumType setName(final String name) {
- this.name = name;
- return this;
- }
-
- public boolean isFlags() {
- return isFlags;
- }
-
- public EnumType setFlags(final boolean isFlags) {
- this.isFlags = isFlags;
- return this;
- }
-
- public FullQualifiedName getUnderlyingType() {
- return underlyingType;
- }
-
- public EnumType setUnderlyingType(final FullQualifiedName underlyingType) {
- this.underlyingType = underlyingType;
- return this;
- }
-
- public List<EnumMember> getMembers() {
- return members;
- }
-
- public EnumType setMembers(final List<EnumMember> members) {
- this.members = members;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java
deleted file mode 100644
index eaa1e34..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Expression.java
+++ /dev/null
@@ -1,24 +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.server.api.edm.provider;
-
-//TODO: Expression implementation
-public class Expression {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java
deleted file mode 100644
index 6ada83f..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Function.java
+++ /dev/null
@@ -1,65 +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.server.api.edm.provider;
-
-import java.util.List;
-
-public class Function extends Operation {
-
- private boolean isComposable;
-
- public boolean isComposable() {
- return isComposable;
- }
-
- public Function setComposable(final boolean isComposable) {
- this.isComposable = isComposable;
- return this;
- }
-
- @Override
- public Function setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public Function setBound(final boolean isBound) {
- this.isBound = isBound;
- return this;
- }
-
- @Override
- public Function setEntitySetPath(final EntitySetPath entitySetPath) {
- this.entitySetPath = entitySetPath;
- return this;
- }
-
- @Override
- public Function setParameters(final List<Parameter> parameters) {
- this.parameters = parameters;
- return this;
- }
-
- @Override
- public Function setReturnType(final ReturnType returnType) {
- this.returnType = returnType;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java
deleted file mode 100644
index 6b82bbe..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/FunctionImport.java
+++ /dev/null
@@ -1,64 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.odata4.commons.api.edm.Target;
-
-public class FunctionImport extends OperationImport {
-
- private FullQualifiedName function;
-
- private boolean includeInServiceDocument;
-
- @Override
- public String getName() {
- return name;
- }
-
- @Override
- public FunctionImport setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public FunctionImport setEntitySet(final Target entitySet) {
- this.entitySet = entitySet;
- return this;
- }
-
- public FullQualifiedName getFunction() {
- return function;
- }
-
- public FunctionImport setFunction(final FullQualifiedName function) {
- this.function = function;
- return this;
- }
-
- public boolean isIncludeInServiceDocument() {
- return includeInServiceDocument;
- }
-
- public FunctionImport setIncludeInServiceDocument(final boolean includeInServiceDocument) {
- this.includeInServiceDocument = includeInServiceDocument;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java
deleted file mode 100644
index a968fbd..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Mapping.java
+++ /dev/null
@@ -1,96 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmMapping;
-
-public class Mapping implements EdmMapping {
-
- private String value;
-
- private Object object;
-
- private String mediaResourceSourceKey;
-
- private String mediaResourceMimeTypeKey;
-
- @Override
- public String getInternalName() {
- return value;
- }
-
- @Override
- public Object getObject() {
- return object;
- }
-
- @Override
- public String getMediaResourceSourceKey() {
- return mediaResourceSourceKey;
- }
-
- @Override
- public String getMediaResourceMimeTypeKey() {
- return mediaResourceMimeTypeKey;
- }
-
- /**
- * Sets the value for this {@link Mapping}.
- *
- * @param value
- * @return {@link Mapping} for method chaining
- */
- public Mapping setInternalName(final String value) {
- this.value = value;
- return this;
- }
-
- /**
- * Sets an object. This method can be used by a provider to set whatever it wants to associate with this.
- *
- * @param object
- * @return {@link Mapping} for method chaining
- */
- public Mapping setObject(final Object object) {
- this.object = object;
- return this;
- }
-
- /**
- * Sets the key for the resource source key which is used for the lookup in the data map
- *
- * @param mediaResourceSourceKey under which the source can be found in the data map
- * @return {@link Mapping} for method chaining
- */
- public Mapping setMediaResourceSourceKey(final String mediaResourceSourceKey) {
- this.mediaResourceSourceKey = mediaResourceSourceKey;
- return this;
- }
-
- /**
- * Sets the key for the resource mime type key which is used for the lookup in the data map
- *
- * @param mediaResourceMimeTypeKey under which the mime type can be found in the data map
- * @return {@link Mapping} for method chaining
- */
- public Mapping setMediaResourceMimeTypeKey(final String mediaResourceMimeTypeKey) {
- this.mediaResourceMimeTypeKey = mediaResourceMimeTypeKey;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java
deleted file mode 100644
index 773485f..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationProperty.java
+++ /dev/null
@@ -1,118 +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.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-import org.apache.olingo.odata4.commons.api.edm.constants.EdmOnDelete;
-
-public class NavigationProperty {
-
- private String name;
-
- private FullQualifiedName type;
-
- private boolean isCollection;
-
- private String partner;
-
- private boolean containsTarget;
-
- private List<ReferentialConstraint> referentialConstraints;
-
- // Facets
- private Boolean nullable;
-
- // Refactor this onDelete
- private EdmOnDelete onDelete;
-
-//Annotations?
- public String getName() {
- return name;
- }
-
- public boolean isCollection() {
- return isCollection;
- }
-
- public NavigationProperty setCollection(final boolean isCollection) {
- this.isCollection = isCollection;
- return this;
- }
-
- public NavigationProperty setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getType() {
- return type;
- }
-
- public NavigationProperty setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- public String getPartner() {
- return partner;
- }
-
- public NavigationProperty setPartner(final String partner) {
- this.partner = partner;
- return this;
- }
-
- public boolean isContainsTarget() {
- return containsTarget;
- }
-
- public NavigationProperty setContainsTarget(final boolean containsTarget) {
- this.containsTarget = containsTarget;
- return this;
- }
-
- public List<ReferentialConstraint> getReferentialConstraints() {
- return referentialConstraints;
- }
-
- public NavigationProperty setReferentialConstraints(final List<ReferentialConstraint> referentialConstraints) {
- this.referentialConstraints = referentialConstraints;
- return this;
- }
-
- public Boolean getNullable() {
- return nullable;
- }
-
- public NavigationProperty setNullable(final Boolean nullable) {
- this.nullable = nullable;
- return this;
- }
-
- public EdmOnDelete getOnDelete() {
- return onDelete;
- }
-
- public NavigationProperty setOnDelete(final EdmOnDelete onDelete) {
- this.onDelete = onDelete;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java
deleted file mode 100644
index 0e82a3c..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/NavigationPropertyBinding.java
+++ /dev/null
@@ -1,46 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.Target;
-
-public class NavigationPropertyBinding {
-
- private String path;
-
- private Target target;
-
- public String getPath() {
- return path;
- }
-
- public NavigationPropertyBinding setPath(final String path) {
- this.path = path;
- return this;
- }
-
- public Target getTarget() {
- return target;
- }
-
- public NavigationPropertyBinding setTarget(final Target target) {
- this.target = target;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java
deleted file mode 100644
index d2a7dfe..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Operation.java
+++ /dev/null
@@ -1,81 +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.server.api.edm.provider;
-
-import java.util.List;
-
-public abstract class Operation {
-
- protected String name;
-
- protected boolean isBound;
-
- // Do we need EntitySetPath as a class?
- protected EntitySetPath entitySetPath;
-
- protected List<Parameter> parameters;
-
- protected ReturnType returnType;
-
- // Annotations?
- public String getName() {
- return name;
- }
-
- public Operation setName(final String name) {
- this.name = name;
- return this;
- }
-
- public boolean isBound() {
- return isBound;
- }
-
- public Operation setBound(final boolean isBound) {
- this.isBound = isBound;
- return this;
- }
-
- public EntitySetPath getEntitySetPath() {
- return entitySetPath;
- }
-
- public Operation setEntitySetPath(final EntitySetPath entitySetPath) {
- this.entitySetPath = entitySetPath;
- return this;
- }
-
- public List<Parameter> getParameters() {
- return parameters;
- }
-
- public Operation setParameters(final List<Parameter> parameters) {
- this.parameters = parameters;
- return this;
- }
-
- public ReturnType getReturnType() {
- return returnType;
- }
-
- public Operation setReturnType(final ReturnType returnType) {
- this.returnType = returnType;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java
deleted file mode 100644
index bd845bd..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/OperationImport.java
+++ /dev/null
@@ -1,47 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.Target;
-
-public abstract class OperationImport {
-
- protected String name;
-
- protected Target entitySet;
-
- // Annotations?
- public String getName() {
- return name;
- }
-
- public OperationImport setName(final String name) {
- this.name = name;
- return this;
- }
-
- public Target getEntitySet() {
- return entitySet;
- }
-
- public OperationImport setEntitySet(final Target entitySet) {
- this.entitySet = entitySet;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java
deleted file mode 100644
index 50dcee8..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Parameter.java
+++ /dev/null
@@ -1,113 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class Parameter {
-
- private String name;
-
- private FullQualifiedName type;
-
- private boolean isCollection;
-
- private Mapping mapping;
-
- // Facets?
- private Boolean nullable;
-
- private Integer maxLength;
-
- private Integer precision;
-
- private Integer scale;
-
- public String getName() {
- return name;
- }
-
- public Parameter setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getType() {
- return type;
- }
-
- public Parameter setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- public boolean isCollection() {
- return isCollection;
- }
-
- public Parameter setCollection(final boolean isCollection) {
- this.isCollection = isCollection;
- return this;
- }
-
- public Boolean getNullable() {
- return nullable;
- }
-
- public Parameter setNullable(final Boolean nullable) {
- this.nullable = nullable;
- return this;
- }
-
- public Integer getMaxLength() {
- return maxLength;
- }
-
- public Parameter setMaxLength(final Integer maxLength) {
- this.maxLength = maxLength;
- return this;
- }
-
- public Integer getPrecision() {
- return precision;
- }
-
- public Parameter setPrecision(final Integer precision) {
- this.precision = precision;
- return this;
- }
-
- public Integer getScale() {
- return scale;
- }
-
- public Parameter setScale(final Integer scale) {
- this.scale = scale;
- return this;
- }
-
- public Mapping getMapping() {
- return mapping;
- }
-
- public Parameter setMapping(final Mapping mapping) {
- this.mapping = mapping;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java
deleted file mode 100644
index 064779a..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Property.java
+++ /dev/null
@@ -1,148 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class Property {
-
- private String name;
-
- // Can be simple or complex
- private FullQualifiedName type;
-
- private boolean collection;
-
- // TODO: Mimetype and mapping what here
- private String mimeType;
-
- private Mapping mapping;
-
- // Facets
- private String defaultValue;
-
- private Boolean nullable;
-
- private Integer maxLength;
-
- private Integer precision;
-
- private Integer scale;
-
- private Boolean unicode;
-
- public String getName() {
- return name;
- }
-
- public Property setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getType() {
- return type;
- }
-
- public Property setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- public boolean isCollection() {
- return collection;
- }
-
- public Property setCollection(final boolean isCollection) {
- collection = isCollection;
- return this;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public Property setDefaultValue(final String defaultValue) {
- this.defaultValue = defaultValue;
- return this;
- }
-
- public Boolean getNullable() {
- return nullable;
- }
-
- public Property setNullable(final Boolean nullable) {
- this.nullable = nullable;
- return this;
- }
-
- public Integer getMaxLength() {
- return maxLength;
- }
-
- public Property setMaxLength(final Integer maxLength) {
- this.maxLength = maxLength;
- return this;
- }
-
- public Integer getPrecision() {
- return precision;
- }
-
- public Property setPrecision(final Integer precision) {
- this.precision = precision;
- return this;
- }
-
- public Integer getScale() {
- return scale;
- }
-
- public Property setScale(final Integer scale) {
- this.scale = scale;
- return this;
- }
-
- public Boolean isUnicode() {
- return unicode;
- }
-
- public Property setUnicode(final Boolean isUnicode) {
- unicode = isUnicode;
- return this;
- }
-
- public String getMimeType() {
- return mimeType;
- }
-
- public Property setMimeType(final String mimeType) {
- this.mimeType = mimeType;
- return this;
- }
-
- public Mapping getMapping() {
- return mapping;
- }
-
- public Property setMapping(final Mapping mapping) {
- this.mapping = mapping;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java
deleted file mode 100644
index f5ab3b0..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/PropertyRef.java
+++ /dev/null
@@ -1,55 +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.server.api.edm.provider;
-
-public class PropertyRef {
-
- private String propertyName;
-
- private String alias;
-
- private String path;
-
- public String getPath() {
- return path;
- }
-
- public PropertyRef setPath(final String path) {
- this.path = path;
- return this;
- }
-
- public String getPropertyName() {
- return propertyName;
- }
-
- public PropertyRef setPropertyName(final String name) {
- propertyName = name;
- return this;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public PropertyRef setAlias(final String alias) {
- this.alias = alias;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java
deleted file mode 100644
index ee0b3a3..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReferentialConstraint.java
+++ /dev/null
@@ -1,46 +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.server.api.edm.provider;
-
-public class ReferentialConstraint {
-
- // TODO: check data type
- private String property;
-
- private String referencedProperty;
-
- // Annotations
- public String getProperty() {
- return property;
- }
-
- public ReferentialConstraint setProperty(final String property) {
- this.property = property;
- return this;
- }
-
- public String getReferencedProperty() {
- return referencedProperty;
- }
-
- public ReferentialConstraint setReferencedProperty(final String referencedProperty) {
- this.referencedProperty = referencedProperty;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java
deleted file mode 100644
index 45d2690..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/ReturnType.java
+++ /dev/null
@@ -1,91 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class ReturnType {
-
- private FullQualifiedName type;
-
- private boolean isCollection;
-
- // facets
- private Boolean nullable;
-
- private Integer maxLength;
-
- private Integer precision;
-
- private Integer scale;
-
- public FullQualifiedName getType() {
- return type;
- }
-
- public ReturnType setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- public boolean isCollection() {
- return isCollection;
- }
-
- public ReturnType setCollection(final boolean isCollection) {
- this.isCollection = isCollection;
- return this;
- }
-
- public Boolean getNullable() {
- return nullable;
- }
-
- public ReturnType setNullable(final Boolean nullable) {
- this.nullable = nullable;
- return this;
- }
-
- public Integer getMaxLength() {
- return maxLength;
- }
-
- public ReturnType setMaxLength(final Integer maxLength) {
- this.maxLength = maxLength;
- return this;
- }
-
- public Integer getPrecision() {
- return precision;
- }
-
- public ReturnType setPrecision(final Integer precision) {
- this.precision = precision;
- return this;
- }
-
- public Integer getScale() {
- return scale;
- }
-
- public ReturnType setScale(final Integer scale) {
- this.scale = scale;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java
deleted file mode 100644
index 480a28e..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Schema.java
+++ /dev/null
@@ -1,135 +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.server.api.edm.provider;
-
-import java.util.List;
-
-public class Schema {
-
- private String namespace;
-
- private String alias;
-
- private List<EnumType> enumTypes;
-
- private List<TypeDefinition> typeDefinitions;
-
- private List<EntityType> entityTypes;
-
- private List<ComplexType> complexTypes;
-
- private List<Action> actions;
-
- private List<Function> functions;
-
- private EntityContainer entityContainer;
-
- private List<Term> terms;
-
- // Annotations
- public String getNamespace() {
- return namespace;
- }
-
- public Schema setNamespace(final String namespace) {
- this.namespace = namespace;
- return this;
- }
-
- public String getAlias() {
- return alias;
- }
-
- public Schema setAlias(final String alias) {
- this.alias = alias;
- return this;
- }
-
- public List<EnumType> getEnumTypes() {
- return enumTypes;
- }
-
- public Schema setEnumTypes(final List<EnumType> enumTypes) {
- this.enumTypes = enumTypes;
- return this;
- }
-
- public List<TypeDefinition> getTypeDefinitions() {
- return typeDefinitions;
- }
-
- public Schema setTypeDefinitions(final List<TypeDefinition> typeDefinitions) {
- this.typeDefinitions = typeDefinitions;
- return this;
- }
-
- public List<EntityType> getEntityTypes() {
- return entityTypes;
- }
-
- public Schema setEntityTypes(final List<EntityType> entityTypes) {
- this.entityTypes = entityTypes;
- return this;
- }
-
- public List<ComplexType> getComplexTypes() {
- return complexTypes;
- }
-
- public Schema setComplexTypes(final List<ComplexType> complexTypes) {
- this.complexTypes = complexTypes;
- return this;
- }
-
- public List<Action> getActions() {
- return actions;
- }
-
- public Schema setActions(final List<Action> actions) {
- this.actions = actions;
- return this;
- }
-
- public List<Function> getFunctions() {
- return functions;
- }
-
- public Schema setFunctions(final List<Function> functions) {
- this.functions = functions;
- return this;
- }
-
- public EntityContainer getEntityContainer() {
- return entityContainer;
- }
-
- public Schema setEntityContainer(final EntityContainer entityContainer) {
- this.entityContainer = entityContainer;
- return this;
- }
-
- public List<Term> getTerms() {
- return terms;
- }
-
- public Schema setTerms(final List<Term> terms) {
- this.terms = terms;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java
deleted file mode 100644
index b8607db..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Singleton.java
+++ /dev/null
@@ -1,44 +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.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class Singleton extends BindingTarget {
-
- @Override
- public Singleton setName(final String name) {
- this.name = name;
- return this;
- }
-
- @Override
- public Singleton setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- @Override
- public Singleton setNavigationPropertyBindings(final List<NavigationPropertyBinding> navigationPropertyBindings) {
- this.navigationPropertyBindings = navigationPropertyBindings;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java
deleted file mode 100644
index f91e55e..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/StructuredType.java
+++ /dev/null
@@ -1,93 +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.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public abstract class StructuredType {
-
- protected String name;
-
- protected boolean isOpenType;
-
- protected FullQualifiedName baseType;
-
- protected boolean isAbstract;
-
- protected List<Property> properties;
-
- protected List<NavigationProperty> navigationProperties;
-
- // What about mapping and annotations?
- public String getName() {
- return name;
- }
-
- public StructuredType setName(final String name) {
- this.name = name;
- return this;
- }
-
- public boolean isOpenType() {
- return isOpenType;
- }
-
- public StructuredType setOpenType(final boolean isOpenType) {
- this.isOpenType = isOpenType;
- return this;
- }
-
- public FullQualifiedName getBaseType() {
- return baseType;
- }
-
- public StructuredType setBaseType(final FullQualifiedName baseType) {
- this.baseType = baseType;
- return this;
- }
-
- public boolean isAbstract() {
- return isAbstract;
- }
-
- public StructuredType setAbstract(final boolean isAbstract) {
- this.isAbstract = isAbstract;
- return this;
- }
-
- public List<Property> getProperties() {
- return properties;
- }
-
- public StructuredType setProperties(final List<Property> properties) {
- this.properties = properties;
- return this;
- }
-
- public List<NavigationProperty> getNavigationProperties() {
- return navigationProperties;
- }
-
- public StructuredType setNavigationProperties(final List<NavigationProperty> navigationProperties) {
- this.navigationProperties = navigationProperties;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java
deleted file mode 100644
index b0ddbe6..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/Term.java
+++ /dev/null
@@ -1,150 +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.server.api.edm.provider;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class Term {
-
- private String name;
-
- private FullQualifiedName type;
-
- private FullQualifiedName baseTerm;
-
- // TODO: AppliesTo is a list of csdl elements => should we put this list inside an enum?
- private String appliesTo;
-
- private boolean isCollection;
-
- // Facets
- private String defaultValue;
-
- private Boolean nullable;
-
- private Integer maxLength;
-
- private Integer precision;
-
- private Integer scale;
-
- // Annotation
- private List<Annotation> annotations;
-
- public String getName() {
- return name;
- }
-
- public Term setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getType() {
- return type;
- }
-
- public Term setType(final FullQualifiedName type) {
- this.type = type;
- return this;
- }
-
- public FullQualifiedName getBaseTerm() {
- return baseTerm;
- }
-
- public Term setBaseTerm(final FullQualifiedName baseTerm) {
- this.baseTerm = baseTerm;
- return this;
- }
-
- public String getAppliesTo() {
- return appliesTo;
- }
-
- public Term setAppliesTo(final String appliesTo) {
- this.appliesTo = appliesTo;
- return this;
- }
-
- public boolean isCollection() {
- return isCollection;
- }
-
- public Term setCollection(final boolean isCollection) {
- this.isCollection = isCollection;
- return this;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
-
- public Term setDefaultValue(final String defaultValue) {
- this.defaultValue = defaultValue;
- return this;
- }
-
- public Boolean getNullable() {
- return nullable;
- }
-
- public Term setNullable(final Boolean nullable) {
- this.nullable = nullable;
- return this;
- }
-
- public Integer getMaxLength() {
- return maxLength;
- }
-
- public Term setMaxLength(final Integer maxLength) {
- this.maxLength = maxLength;
- return this;
- }
-
- public Integer getPrecision() {
- return precision;
- }
-
- public Term setPrecision(final Integer precision) {
- this.precision = precision;
- return this;
- }
-
- public Integer getScale() {
- return scale;
- }
-
- public Term setScale(final Integer scale) {
- this.scale = scale;
- return this;
- }
-
- public List<Annotation> getAnnotations() {
- return annotations;
- }
-
- public Term setAnnotations(final List<Annotation> annotations) {
- this.annotations = annotations;
- return this;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java
deleted file mode 100644
index 55d0ebf..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/edm/provider/TypeDefinition.java
+++ /dev/null
@@ -1,94 +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.server.api.edm.provider;
-
-import org.apache.olingo.odata4.commons.api.edm.FullQualifiedName;
-
-public class TypeDefinition {
-
- private String name;
-
- // TODO: UnderlyingType can only be primitve...
- private FullQualifiedName underlyingType;
-
- // Facets
- private Integer maxLength;
-
- private Integer precision;
-
- private Integer scale;
-
- private Boolean isUnicode;
-
- // Annotations
- public String getName() {
- return name;
- }
-
- public TypeDefinition setName(final String name) {
- this.name = name;
- return this;
- }
-
- public FullQualifiedName getUnderlyingType() {
- return underlyingType;
- }
-
- public TypeDefinition setUnderlyingType(final FullQualifiedName underlyingType) {
- this.underlyingType = underlyingType;
- return this;
- }
-
- public Integer getMaxLength() {
- return maxLength;
- }
-
- public TypeDefinition setMaxLength(final Integer maxLength) {
- this.maxLength = maxLength;
- return this;
- }
-
- public Integer getPrecision() {
- return precision;
- }
-
- public TypeDefinition setPrecision(final Integer precision) {
- this.precision = precision;
- return this;
- }
-
- public Integer getScale() {
- return scale;
- }
-
- public TypeDefinition setScale(final Integer scale) {
- this.scale = scale;
- return this;
- }
-
- public Boolean getIsUnicode() {
- return isUnicode;
- }
-
- public TypeDefinition setIsUnicode(final Boolean isUnicode) {
- this.isUnicode = isUnicode;
- return this;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java
deleted file mode 100644
index 9bca76a..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java
+++ /dev/null
@@ -1,48 +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.server.api.uri;
-
-
-/**
- * Object acting as general access to URI information extracted from the request URI. Depending on
- * the URI info kind different interfaces are used to provide access to that information. </p>
- * Use method {@link #getKind()} to obtain URI info kind information and to perform an appropriate cast.
- */
-public interface UriInfo extends
- UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin,
- UriInfoEntityId, UriInfoMetadata, UriInfoResource {
-
- public UriInfoKind getKind();
-
- public UriInfoService asUriInfoService();
-
- public UriInfoAll asUriInfoAll();
-
- public UriInfoBatch asUriInfoBatch();
-
- public UriInfoCrossjoin asUriInfoCrossjoin();
-
- public UriInfoEntityId asUriInfoEntityId();
-
- public UriInfoMetadata asUriInfoMetadata();
-
- public UriInfoResource asUriInfoResource();
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java
deleted file mode 100644
index 5a1e0c7..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.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.server.api.uri;
-
-
-/**
- * Used for URI info kind {@link UriInfoKind#all} to describe URIs like
- * http://.../serviceroot/$all
- */
-public interface UriInfoAll {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java
deleted file mode 100644
index 4e3142e..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java
+++ /dev/null
@@ -1,27 +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.server.api.uri;
-
-/**
- * Used for URI info kind {@link UriInfoKind#batch} to describe URIs like
- * http://.../serviceroot/$batch
- */
-public interface UriInfoBatch {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java
deleted file mode 100644
index d74cf12..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java
+++ /dev/null
@@ -1,34 +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.server.api.uri;
-
-import java.util.List;
-
-/**
- * Used for URI info kind {@link UriInfoKind#crossjoin} to describe URIs like
- * http://.../serviceroot/$crossjoin(...)
- */
-public interface UriInfoCrossjoin {
-
- /**
- * @return List of entity set names
- */
- List<String> getEntitySetNames();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java
deleted file mode 100644
index b28f373..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java
+++ /dev/null
@@ -1,68 +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.server.api.uri;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;
-import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption;
-
-/**
- * Used for URI info kind {@link UriInfoKind#entityId} to describe URIs like
- * http://.../serviceroot/$entity...
- */
-public interface UriInfoEntityId {
-
- /**
- * @return List of custom query options used in the URI
- */
- public List<CustomQueryOption> getCustomQueryOptions();
-
- /**
- * Behind $entity a optional type cast can be used in the URI.
- * For example: http://.../serviceroot/$entity/namespace.entitytype
- * @return Type cast if found, otherwise null
- */
- public EdmEntityType getEntityTypeCast();
-
- /**
- * @return Object containing information of the $expand option
- */
- public ExpandOption getExpandOption();
-
- /**
- * @return Object containing information of the $format option
- */
- public FormatOption getFormatOption();
-
- /**
- * @return Object containing information of the $id option
- */
- public IdOption getIdOption();
-
- /**
- * @return Object containing information of the $select option
- */
- public SelectOption getSelectOption();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java
deleted file mode 100644
index 7065edf..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java
+++ /dev/null
@@ -1,67 +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.server.api.uri;
-
-/**
- * Defining the various info kinds
- */
-public enum UriInfoKind {
-
- /**
- * Class: {@link UriInfoAll}<br>
- * URI: http://.../serviceroot/$all
- */
- all,
-
- /**
- * Class: {@link UriInfoBatch}<br>
- * URI: http://.../serviceroot/$batch
- */
- batch,
-
- /**
- * Class: {@link UriInfoCrossjoin}<br>
- * URI: http://.../serviceroot/$crossjoin
- */
- crossjoin,
-
- /**
- * Class: {@link UriInfoEntityId}<br>
- * URI: http://.../serviceroot/$entity(...)
- */
- entityId,
-
- /**
- * Class: {@link UriInfoMetadata}<br>
- * URI: http://.../serviceroot/$metadata...
- */
- metadata,
-
- /**
- * Class: {@link UriInfoResource}<br>
- * URI: http://.../serviceroot/entitySet
- */
- resource,
-
- /**
- * Class: {@link UriInfoService}<br>
- * URI: http://.../serviceroot
- */
- service;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java
deleted file mode 100644
index d23d93e..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java
+++ /dev/null
@@ -1,39 +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.server.api.uri;
-
-import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption;
-
-/**
- * Used for URI info kind {@link UriInfoKind#metadata} to describe URIs like
- * http://.../serviceroot/$metadata...
- */
-public interface UriInfoMetadata {
-
- /**
- * @return Object containing information of the $id option
- */
- public FormatOption getFormatOption();
-
- /**
- * @return Object containing information of the URI fragment
- */
- public String getFragment();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java
deleted file mode 100644
index c7f90c2..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java
+++ /dev/null
@@ -1,118 +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.server.api.uri;
-
-import java.util.List;
-
-import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.CountOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.SkipTokenOption;
-import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption;
-
-/**
- * Used for URI info kind {@link UriInfoKind#resource} to describe URIs like
- * E.g. http://.../serviceroot/entitySet
- */
-public interface UriInfoResource {
-
- /**
- * @return List of custom query options used in the URI
- */
- List<CustomQueryOption> getCustomQueryOptions();
-
- /**
- * @return Object containing information of the $expand option
- */
- ExpandOption getExpandOption();
-
- /**
- * @return Object containing information of the $filter option
- */
- FilterOption getFilterOption();
-
- /**
- * @return Object containing information of the $format option
- */
- FormatOption getFormatOption();
-
- /**
- * @return Object containing information of the $id option
- */
- IdOption getIdOption();
-
- /**
- * @return Object containing information of the $count option
- */
- CountOption getCountOption();
-
- /**
- * @return Object containing information of the $orderby option
- */
- OrderByOption getOrderByOption();
-
- /**
- * @return Object containing information of the $search option
- */
- SearchOption getSearchOption();
-
- /**
- * @return Object containing information of the $select option
- */
- SelectOption getSelectOption();
-
- /**
- * @return Object containing information of the $skip option
- */
- SkipOption getSkipOption();
-
- /**
- * @return Object containing information of the $skiptoken option
- */
- SkipTokenOption getSkipTokenOption();
-
- /**
- * @return Object containing information of the $top option
- */
- TopOption getTopOption();
-
- /**
- * The path segments behind the service root define which resources are
- * requested by that URI. This may be entities/functions/actions and more.
- * Each segments information (name, key predicates, function parameters, ...) is
- * stored within an resource object dedicated for that segment type.</p>
- * For example: the URI http://.../serviceroot/entitySet(1)/Adresse will
- * have 2 ResourceParts:<br>
- * - The first one of type {@link UriResourceEntitySet}
- * containing the name of the entity set and also the key predicate information.<br>
- * - The second one of type {@link UriResourceComplexProperty} containing the name of
- * the accessed complex property
- *
- * @return List of resource parts.
- */
- List<UriResource> getUriResourceParts();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java
deleted file mode 100644
index a6c9eb9..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java
+++ /dev/null
@@ -1,27 +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.server.api.uri;
-
-/**
- * Used for URI info kind {@link UriInfoKind#service} to describe URIs like
- * http://.../serviceroot
- */
-public interface UriInfoService {
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java
deleted file mode 100644
index 19584c9..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java
+++ /dev/null
@@ -1,53 +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.server.api.uri;
-
-import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
-
-/**
- * Represents an function parameter or key predicate when used in the URI.
- */
-public interface UriParameter {
-
- /**
- * @return Alias name if the parameters values is an alias, otherwise null
- */
- public String getAlias();
-
- /**
- * @return Text of the parameters value
- */
- public String getText();
-
- /**
- * @return If the parameters value is a expression and expression is returned, otherwise null
- */
- public Expression getExression();
-
- /**
- * @return Name of the parameter
- */
- public String getName();
-
- /**
- * @return Name of the referenced property when referential constrains are used
- */
- public String getRefencedProperty();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java
deleted file mode 100644
index a83c5da..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java
+++ /dev/null
@@ -1,35 +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.server.api.uri;
-
-/**
- * Super interface for all objects representing resource parts.
- * See {@link UriInfoResource} for details.
- */
-public interface UriResource {
-
- /**
- * @return Kind of the resource part
- */
- UriResourceKind getKind();
-
- @Override
- String toString();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java
deleted file mode 100644
index 83c83e5..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java
+++ /dev/null
@@ -1,42 +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.server.api.uri;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmAction;
-import org.apache.olingo.odata4.commons.api.edm.EdmActionImport;
-
-/**
- * Used to describe an action used within an resource path
- * For example: http://.../serviceroot/action()
- */
-public interface UriResourceAction extends UriResourcePartTyped {
-
- /**
- * @return Action used in the resource path
- */
- EdmAction getAction();
-
- /**
- * Convenience method which returns the {@link EdmActionImport} which was used in
- * the resource path to define the {@link EdmAction}.
- * @return
- */
- EdmActionImport getActionImport();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/897db8ef/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java b/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java
deleted file mode 100644
index e0b0425..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java
+++ /dev/null
@@ -1,41 +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.server.api.uri;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmComplexType;
-
-/**
- * Used to describe an complex property used within an resource path
- * E.g. http://.../serviceroot/entityset(1)/complexproperty
- */
-public interface UriResourceComplexProperty extends UriResourceProperty {
-
- /**
- * @return Complex property used in the resource path
- */
- EdmComplexType getComplexType();
-
- /**
- * Behind a complex property may be a type filter
- * E.g. http://.../serviceroot/entityset(1)/complexproperty/namespace.complextype
- * @return Type filter if found, otherwise null
- */
- EdmComplexType getComplexTypeFilter();
-
-}