You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2013/09/24 14:42:52 UTC
[25/51] [partial] Refactored project structure
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
deleted file mode 100644
index b14f0c4..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.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.odata2.api.uri.expression;
-
-import org.apache.olingo.odata2.api.exception.ODataApplicationException;
-
-/**
- * The interface {@link Visitable} is part of the visitor pattern used to traverse
- * the expression tree build from a $filter expression string or $orderby expression string.
- * It is implemented by each class used as node in an expression tree.
- *
- * @see ExpressionVisitor
- *
- */
-public interface Visitable {
-
- /**
- * Method {@link #accept(ExpressionVisitor)} is called when traversing the expression tree. This method is invoked on
- * each
- * expression used as node in an expression tree. The implementations should
- * behave as follows:
- * <li>Call accept on all sub nodes and store the returned Objects
- * <li>Call the appropriate method on the {@link ExpressionVisitor} instance and provide the stored objects to that
- * instance
- * <li>Return the object which should be passed to the processing algorithm of the parent expression node
- * <br>
- * <br>
- * @param visitor
- * Object ( implementing {@link ExpressionVisitor}) whose methods are called during traversing a expression node of
- * the expression tree.
- * @return
- * Object which should be passed to the processing algorithm of the parent expression node
- * @throws ExceptionVisitExpression
- * Exception occurred the OData library while traversing the tree
- * @throws ODataApplicationException
- * Exception thrown by the application who implemented the visitor
- */
- Object accept(ExpressionVisitor visitor) throws ExceptionVisitExpression, ODataApplicationException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java
deleted file mode 100644
index 7df2cc7..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/package-info.java
+++ /dev/null
@@ -1,29 +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.
- ******************************************************************************/
-/**
- * Expression Parser
- * <p>This package contains all classes necessary to decribe an expression tree(e.g. a filter or order by tree)
- *
- * <p>Trees can be traversed by implementing the {@link org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor}
- * interface and calling the accept() method.
- * <br>Different types of expressions can be found in {@link org.apache.olingo.odata2.api.uri.expression.ExpressionKind}
- * .
- */
-package org.apache.olingo.odata2.api.uri.expression;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
deleted file mode 100644
index 021ee65..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
+++ /dev/null
@@ -1,116 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmProperty;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-
-/**
- * Access to the parts of the request URI that are relevant for DELETE requests.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface DeleteUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target type of the request: an entity type, a simple type, or a complex type.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the path used to select a (simple or complex) property of an entity,
- * or an empty list if no property is accessed.
- * @return List of {@link EdmProperty}
- */
- public List<EdmProperty> getPropertyPath();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
deleted file mode 100644
index b450683..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
+++ /dev/null
@@ -1,123 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmProperty;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of complex properties.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetComplexPropertyUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target complex type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the path used to select a (simple or complex) property of an entity,
- * or an empty list if no property is accessed.
- * @return List of {@link EdmProperty}
- */
- public List<EdmProperty> getPropertyPath();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
deleted file mode 100644
index 17ec1a2..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
+++ /dev/null
@@ -1,123 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the count of a single entity (also known as existence check).
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntityCountUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Determines whether $count has been used in the request URI.
- * @return whether $count has been used
- */
- public boolean isCount();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
deleted file mode 100644
index 843e505..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
+++ /dev/null
@@ -1,121 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the number of links to a single entity (also known as existence check).
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntityLinkCountUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Determines whether $count has been used in the request URI.
- * @return whether $count has been used
- */
- public boolean isCount();
-
- /**
- * Determines whether $links has been used in the request URI.
- * @return whether $links has been used
- */
- public boolean isLinks();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
deleted file mode 100644
index 2c420e0..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
+++ /dev/null
@@ -1,121 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the URI of a single entity.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntityLinkUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Determines whether $links has been used in the request URI.
- * @return whether $links has been used
- */
- public boolean isLinks();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
deleted file mode 100644
index cd56d6f..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
+++ /dev/null
@@ -1,125 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the number of entities.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntitySetCountUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Determines whether $count has been used in the request URI.
- * @return whether $count has been used
- */
- public boolean isCount();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the value of the $skip system query option.
- * @return skip or null
- */
- public Integer getSkip();
-
- /**
- * Gets the value of the $top system query option.
- * @return top or null
- */
- public Integer getTop();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
deleted file mode 100644
index bdb3051..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
+++ /dev/null
@@ -1,131 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the number of links to entities.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntitySetLinksCountUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Determines whether $count has been used in the request URI.
- * @return whether $count has been used
- */
- public boolean isCount();
-
- /**
- * Determines whether $links has been used in the request URI.
- * @return whether $links has been used
- */
- public boolean isLinks();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the value of the $skip system query option.
- * @return skip or null
- */
- public Integer getSkip();
-
- /**
- * Gets the value of the $top system query option.
- * @return top or null
- */
- public Integer getTop();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
deleted file mode 100644
index 33c12a0..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
+++ /dev/null
@@ -1,144 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.commons.InlineCount;
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the URIs of entities.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntitySetLinksUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Determines whether $links has been used in the request URI.
- * @return whether $links has been used
- */
- public boolean isLinks();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the value of the $inlinecount system query option.
- * @return {@link InlineCount} the inline count or null
- */
- public InlineCount getInlineCount();
-
- /**
- * Gets the value of the $skiptoken system query option.
- * @return skip token or null
- */
- public String getSkipToken();
-
- /**
- * Gets the value of the $skip system query option.
- * @return skip or null
- */
- public Integer getSkip();
-
- /**
- * Gets the value of the $top system query option.
- * @return top or null
- */
- public Integer getTop();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
deleted file mode 100644
index f501e5b..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
+++ /dev/null
@@ -1,163 +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.odata2.api.uri.info;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.commons.InlineCount;
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationPropertySegment;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.SelectItem;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of entities.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntitySetUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the value of the $inlinecount system query option.
- * @return {@link InlineCount} the inline count or null
- */
- public InlineCount getInlineCount();
-
- /**
- * Gets the value of the $orderby system query option as root object of the
- * expression tree built during URI parsing.
- * @return the order-by expression or null
- */
- public OrderByExpression getOrderBy();
-
- /**
- * Gets the value of the $skiptoken system query option.
- * @return the skip token or null
- */
- public String getSkipToken();
-
- /**
- * Gets the value of the $skip system query option.
- * @return skip or null
- */
- public Integer getSkip();
-
- /**
- * Gets the value of the $top system query option.
- * @return top or null
- */
- public Integer getTop();
-
- /**
- * Gets the value of the $expand system query option as a list of
- * lists of navigation-property segments, or an empty list if not used.
- * @return List of a list of {@link NavigationPropertySegment} to be expanded
- */
- public List<ArrayList<NavigationPropertySegment>> getExpand();
-
- /**
- * Gets the value of the $select system query option as a list of select items,
- * or an empty list if not used.
- * @return List of {@link SelectItem} to be selected
- */
- public List<SelectItem> getSelect();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
deleted file mode 100644
index be92069..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
+++ /dev/null
@@ -1,140 +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.odata2.api.uri.info;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationPropertySegment;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.SelectItem;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of a single entity.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetEntityUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the value of the $expand system query option as a list of
- * lists of navigation-property segments, or an empty list if not used.
- * @return List of a list of {@link NavigationPropertySegment} to be expanded
- */
- public List<ArrayList<NavigationPropertySegment>> getExpand();
-
- /**
- * Gets the value of the $select system query option as a list of select items,
- * or an empty list if not used.
- * @return List of {@link SelectItem} to be selected
- */
- public List<SelectItem> getSelect();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
deleted file mode 100644
index 56ad943..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
+++ /dev/null
@@ -1,60 +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.odata2.api.uri.info;
-
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-
-/**
- * Access to the parts of the request URI that are relevant for requests
- * of function imports.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetFunctionImportUriInfo {
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
deleted file mode 100644
index a9d6313..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
+++ /dev/null
@@ -1,123 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the media resource of a single entity.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetMediaResourceUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
deleted file mode 100644
index ce8d421..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
+++ /dev/null
@@ -1,37 +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.odata2.api.uri.info;
-
-import java.util.Map;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the metadata document.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetMetadataUriInfo {
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
deleted file mode 100644
index 985bef5..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
+++ /dev/null
@@ -1,43 +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.odata2.api.uri.info;
-
-import java.util.Map;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of the service document.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetServiceDocumentUriInfo {
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
deleted file mode 100644
index 5ba99ca..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
+++ /dev/null
@@ -1,129 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmProperty;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-
-/**
- * Access to the parts of the request URI that are relevant for GET requests
- * of simple properties.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface GetSimplePropertyUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target simple type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the path used to select a (simple or complex) property of an entity,
- * or an empty list if no property is accessed.
- * @return List of {@link EdmProperty}
- */
- public List<EdmProperty> getPropertyPath();
-
- /**
- * Determines whether $value has been used in the request URI.
- * @return whether $value has been used
- */
- public boolean isValue();
-
- /**
- * Gets the value of the $format system query option.
- * @return the format (as set as <code>$format</code> query parameter) or null
- */
- public String getFormat();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
deleted file mode 100644
index 066477a..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
+++ /dev/null
@@ -1,98 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-
-/**
- * Access to the parts of the request URI that are relevant for POST requests.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface PostUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target entity type of the request.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
deleted file mode 100644
index 6bc0a93..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
+++ /dev/null
@@ -1,124 +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.odata2.api.uri.info;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
-import org.apache.olingo.odata2.api.edm.EdmLiteral;
-import org.apache.olingo.odata2.api.edm.EdmProperty;
-import org.apache.olingo.odata2.api.edm.EdmType;
-import org.apache.olingo.odata2.api.uri.KeyPredicate;
-import org.apache.olingo.odata2.api.uri.NavigationSegment;
-import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
-
-/**
- * Access to the parts of the request URI that are relevant for PUT, PATCH, or MERGE requests.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface PutMergePatchUriInfo {
- /**
- * Gets the target entity container.
- * @return {@link EdmEntityContainer} the target entity container
- */
- public EdmEntityContainer getEntityContainer();
-
- /**
- * Gets the start entity set - identical to the target entity set if no navigation
- * has been used.
- * @return {@link EdmEntitySet}
- */
- public EdmEntitySet getStartEntitySet();
-
- /**
- * Gets the target entity set after navigation.
- * @return {@link EdmEntitySet} target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
- /**
- * Gets the function import.
- * @return {@link EdmFunctionImport} the function import
- */
- public EdmFunctionImport getFunctionImport();
-
- /**
- * Gets the target type of the request: an entity type, a simple type, or a complex type.
- * @return {@link EdmType} the target type
- */
- public EdmType getTargetType();
-
- /**
- * Gets the key predicates used to select a single entity out of the start entity set,
- * or an empty list if not used.
- * @return List of {@link KeyPredicate}
- * @see #getStartEntitySet()
- */
- public List<KeyPredicate> getKeyPredicates();
-
- /**
- * Gets the key predicates used to select a single entity out of the target entity set,
- * or an empty list if not used - identical to the key predicates from the last entry
- * retrieved from {@link #getNavigationSegments()} or, if no navigation has been used,
- * to the result of {@link #getKeyPredicates()}.
- * @return List of {@link KeyPredicate}
- * @see #getTargetEntitySet()
- */
- public List<KeyPredicate> getTargetKeyPredicates();
-
- /**
- * Gets the navigation segments, or an empty list if no navigation has been used.
- * @return List of {@link NavigationSegment}
- */
- public List<NavigationSegment> getNavigationSegments();
-
- /**
- * Gets the path used to select a (simple or complex) property of an entity,
- * or an empty list if no property is accessed.
- * @return List of {@link EdmProperty}
- */
- public List<EdmProperty> getPropertyPath();
-
- /**
- * Gets the value of the $filter system query option as root object of the
- * expression tree built during URI parsing.
- * @return the filter expression or null
- */
- public FilterExpression getFilter();
-
- /**
- * Gets the parameters of a function import as Map from parameter names to
- * their corresponding typed values, or an empty list if no function import
- * is used or no parameters are given in the URI.
- * @return Map of {@literal <String,} {@link EdmLiteral}{@literal >} function import parameters
- */
- public Map<String, EdmLiteral> getFunctionImportParameters();
-
- /**
- * Gets the custom query options as Map from option names to their
- * corresponding String values, or an empty list if no custom query options
- * are given in the URI.
- * @return Map of {@literal <String, String>} custom query options
- */
- public Map<String, String> getCustomQueryOptions();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java
deleted file mode 100644
index 5f74efe..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/package-info.java
+++ /dev/null
@@ -1,25 +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.
- ******************************************************************************/
-/**
- * <p>URI Parser Result Views</p>
- * <p>The interfaces of this package provide access to the relevant parts of the parsed
- * request URI for the methods that process a request inside the dispatcher.</p>
- */
-package org.apache.olingo.odata2.api.uri.info;
-