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:54 UTC
[27/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/processor/part/EntityLinkProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
deleted file mode 100644
index 4664c78..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
+++ /dev/null
@@ -1,75 +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.processor.part;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.DeleteUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetEntityLinkCountUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetEntityLinkUriInfo;
-import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
-
-/**
- * Execute an OData entity link request.
- *
- *
- */
-public interface EntityLinkProcessor extends ODataProcessor {
- /**
- * Reads the URI of the target entity of a navigation property.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readEntityLink(GetEntityLinkUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Returns whether the target entity of a navigation property exists.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse existsEntityLink(GetEntityLinkCountUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Updates the link to the target entity of a navigation property.
- * @param uriInfo information about the request URI
- * @param content the content of the request, containing the new URI
- * @param requestContentType the content type of the request body
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse updateEntityLink(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType,
- String contentType) throws ODataException;
-
- /**
- * Deletes the link to the target entity of a navigation property.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse deleteEntityLink(DeleteUriInfo uriInfo, String contentType) throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
deleted file mode 100644
index bf7c618..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.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.odata2.api.processor.part;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.GetEntitySetLinksCountUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetEntitySetLinksUriInfo;
-import org.apache.olingo.odata2.api.uri.info.PostUriInfo;
-
-/**
- * Execute a OData entity links request.
- *
- *
- */
-public interface EntityLinksProcessor extends ODataProcessor {
- /**
- * Reads the URIs of the target entities of a navigation property.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an OData response object
- * @throws ODataException
- */
- ODataResponse readEntityLinks(GetEntitySetLinksUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Counts the number of target entities of a navigation property.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an OData response object
- * @throws ODataException
- */
- ODataResponse countEntityLinks(GetEntitySetLinksCountUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Creates a new link to a target entity of a navigation property.
- * @param uriInfo information about the request URI
- * @param content the content of the request, containing the link data
- * @param requestContentType the content type of the request body
- * @param contentType the content type of the response
- * @return an OData response object
- * @throws ODataException
- */
- ODataResponse createEntityLink(PostUriInfo uriInfo, InputStream content, String requestContentType,
- String contentType) throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
deleted file mode 100644
index 960d55f..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.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.odata2.api.processor.part;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.DeleteUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetMediaResourceUriInfo;
-import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
-
-/**
- * Execute an OData entity media request
- *
- */
-public interface EntityMediaProcessor extends ODataProcessor {
-
- /**
- * Reads the media resource of an entity.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readEntityMedia(GetMediaResourceUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Updates the media resource of an entity.
- * @param uriInfo information about the request URI
- * @param content the content of the request
- * @param requestContentType the content type of the request body
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse updateEntityMedia(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType,
- String contentType) throws ODataException;
-
- /**
- * Deletes the media resource of an entity.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse deleteEntityMedia(DeleteUriInfo uriInfo, String contentType) throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
deleted file mode 100644
index 180988e..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
+++ /dev/null
@@ -1,77 +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.processor.part;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.DeleteUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetEntityCountUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetEntityUriInfo;
-import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
-
-/**
- * Execute a OData entity request.
- *
- *
- */
-public interface EntityProcessor extends ODataProcessor {
-
- /**
- * Reads an entity.
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readEntity(GetEntityUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Checks whether an entity exists.
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse existsEntity(GetEntityCountUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Updates an entity.
- * @param uriInfo information about the request URI
- * @param content the content of the request, containing the updated entity data
- * @param requestContentType the content type of the request body
- * @param merge if <code>true</code>, properties not present in the data are left unchanged;
- * if <code>false</code>, they are reset
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse updateEntity(PutMergePatchUriInfo uriInfo, InputStream content, String requestContentType,
- boolean merge, String contentType) throws ODataException;
-
- /**
- * Deletes an entity.
- * @param uriInfo a {@link DeleteUriInfo} object with information from the URI parser
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse deleteEntity(DeleteUriInfo uriInfo, String contentType) throws ODataException;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
deleted file mode 100644
index 167c2f5..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.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.odata2.api.processor.part;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.GetEntitySetCountUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetEntitySetUriInfo;
-import org.apache.olingo.odata2.api.uri.info.PostUriInfo;
-
-/**
- * Execute a OData entity set request.
- *
- *
- *
- */
-public interface EntitySetProcessor extends ODataProcessor {
-
- /**
- * Reads entities.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readEntitySet(GetEntitySetUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Counts the number of requested entities.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse countEntitySet(GetEntitySetCountUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Creates an entity.
- * @param uriInfo information about the request URI
- * @param content the content of the request, containing the data of the new entity
- * @param requestContentType the content type of the request body
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse createEntity(PostUriInfo uriInfo, InputStream content, String requestContentType, String contentType)
- throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
deleted file mode 100644
index 31f1268..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.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.processor.part;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.GetSimplePropertyUriInfo;
-import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
-
-/**
- * Execute a OData entity simple property request.
- *
- *
- */
-public interface EntitySimplePropertyProcessor extends ODataProcessor {
-
- /**
- * Reads a simple property of an entity.
- * @param contentType the content type of the response
- * @return a {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readEntitySimpleProperty(GetSimplePropertyUriInfo uriInfo, String contentType) throws ODataException;
-
- /**
- * Updates a simple property of an entity.
- * @param uriInfo information about the request URI
- * @param content the content of the request, containing the updated property data
- * @param requestContentType the content type of the request body
- * @param contentType the content type of the response
- * @return a {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse updateEntitySimpleProperty(PutMergePatchUriInfo uriInfo, InputStream content,
- String requestContentType, String contentType) throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
deleted file mode 100644
index b2540e5..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.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.odata2.api.processor.part;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.DeleteUriInfo;
-import org.apache.olingo.odata2.api.uri.info.GetSimplePropertyUriInfo;
-import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
-
-/**
- * Execute a OData entity simple property value request.
- *
- *
- */
-public interface EntitySimplePropertyValueProcessor extends ODataProcessor {
-
- /**
- * Reads the unformatted value of a simple property of an entity.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readEntitySimplePropertyValue(GetSimplePropertyUriInfo uriInfo, String contentType)
- throws ODataException;
-
- /**
- * Updates a simple property of an entity with an unformatted value.
- * @param uriInfo information about the request URI
- * @param content the content of the request, containing the new value
- * @param requestContentType the content type of the request body
- * (important for a binary property)
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse updateEntitySimplePropertyValue(PutMergePatchUriInfo uriInfo, InputStream content,
- String requestContentType, String contentType) throws ODataException;
-
- /**
- * Deletes the value of a simple property of an entity.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return a {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse deleteEntitySimplePropertyValue(DeleteUriInfo uriInfo, String contentType) throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
deleted file mode 100644
index 871aa07..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.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.odata2.api.processor.part;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.GetFunctionImportUriInfo;
-
-/**
- * Execute an OData function import request.
- *
- */
-public interface FunctionImportProcessor extends ODataProcessor {
- /**
- * Executes a function import and returns the result.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse executeFunctionImport(GetFunctionImportUriInfo uriInfo, String contentType) throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
deleted file mode 100644
index 451dce0..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.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.odata2.api.processor.part;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.GetFunctionImportUriInfo;
-
-/**
- * Execute an OData function import value request.
- *
- */
-public interface FunctionImportValueProcessor extends ODataProcessor {
- /**
- * Returns the unformatted value of a function import.
- * @param uriInfo information about the request URI
- * @param contentType the content type of the response
- * @return an {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse executeFunctionImportValue(GetFunctionImportUriInfo uriInfo, String contentType) throws ODataException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
deleted file mode 100644
index bb8f7a7..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
+++ /dev/null
@@ -1,40 +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.processor.part;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
-
-/**
- * Execute a OData metadata request.
- *
- *
- */
-public interface MetadataProcessor extends ODataProcessor {
-
- /**
- * @param contentType
- * @return a {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readMetadata(GetMetadataUriInfo uriInfo, String contentType) throws ODataException;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
deleted file mode 100644
index 3f1303c..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
+++ /dev/null
@@ -1,40 +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.processor.part;
-
-import org.apache.olingo.odata2.api.exception.ODataException;
-import org.apache.olingo.odata2.api.processor.ODataProcessor;
-import org.apache.olingo.odata2.api.processor.ODataResponse;
-import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
-
-/**
- * Execute a OData service document request.
- *
- *
- */
-public interface ServiceDocumentProcessor extends ODataProcessor {
-
- /**
- * @param contentType
- * @return a {@link ODataResponse} object
- * @throws ODataException
- */
- ODataResponse readServiceDocument(GetServiceDocumentUriInfo uriInfo, String contentType) throws ODataException;
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java
deleted file mode 100644
index 70a69db..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/package-info.java
+++ /dev/null
@@ -1,23 +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.
- ******************************************************************************/
-/**
- * Processor Parts<p>
- */
-package org.apache.olingo.odata2.api.processor.part;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
deleted file mode 100644
index e385c62..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
+++ /dev/null
@@ -1,213 +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.rt;
-
-import java.io.InputStream;
-
-import org.apache.olingo.odata2.api.ODataService;
-import org.apache.olingo.odata2.api.batch.BatchResponsePart.BatchResponsePartBuilder;
-import org.apache.olingo.odata2.api.client.batch.BatchChangeSet.BatchChangeSetBuilder;
-import org.apache.olingo.odata2.api.client.batch.BatchChangeSetPart.BatchChangeSetPartBuilder;
-import org.apache.olingo.odata2.api.client.batch.BatchQueryPart.BatchQueryPartBuilder;
-import org.apache.olingo.odata2.api.edm.Edm;
-import org.apache.olingo.odata2.api.edm.EdmSimpleType;
-import org.apache.olingo.odata2.api.edm.EdmSimpleTypeFacade;
-import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
-import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
-import org.apache.olingo.odata2.api.ep.EntityProvider.EntityProviderInterface;
-import org.apache.olingo.odata2.api.ep.EntityProviderException;
-import org.apache.olingo.odata2.api.processor.ODataRequest.ODataRequestBuilder;
-import org.apache.olingo.odata2.api.processor.ODataResponse.ODataResponseBuilder;
-import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
-import org.apache.olingo.odata2.api.uri.UriParser;
-
-/**
- * Provides access to core implementation classes for interfaces. This class is used
- * by internal abstract API implementations and it is not intended to be used by others.
- *
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public abstract class RuntimeDelegate {
-
- private static final String IMPLEMENTATION = "org.apache.olingo.odata2.core.rt.RuntimeDelegateImpl";
-
- /**
- * Create a runtime delegate instance from the core library. The core
- * library (org.apache.olingo.odata2.core.jar) needs to be included into the classpath
- * of the using application.
- * @return an implementation object
- */
- private static RuntimeDelegateInstance getInstance() {
- RuntimeDelegateInstance delegate;
-
- try {
- final Class<?> clazz = Class.forName(RuntimeDelegate.IMPLEMENTATION);
-
- /*
- * We explicitly do not use the singleton pattern to keep the server state free
- * and avoid class loading issues also during hot deployment.
- */
- final Object object = clazz.newInstance();
- delegate = (RuntimeDelegateInstance) object;
-
- } catch (final Exception e) {
- throw new RuntimeDelegateException(e);
- }
- return delegate;
- }
-
- /**
- * An implementation is available in the core library.
- * @org.apache.olingo.odata2.DoNotImplement
- */
- public static abstract class RuntimeDelegateInstance {
-
- protected abstract ODataResponseBuilder createODataResponseBuilder();
-
- protected abstract EdmSimpleType getEdmSimpleType(EdmSimpleTypeKind edmSimpleTypeKind);
-
- protected abstract UriParser getUriParser(Edm edm);
-
- protected abstract EdmSimpleTypeFacade getSimpleTypeFacade();
-
- protected abstract Edm createEdm(EdmProvider provider);
-
- protected abstract EntityProviderInterface createEntityProvider();
-
- protected abstract ODataService createODataSingleProcessorService(EdmProvider provider,
- ODataSingleProcessor processor);
-
- protected abstract EdmProvider createEdmProvider(InputStream metadataXml, boolean validate)
- throws EntityProviderException;
-
- protected abstract BatchResponsePartBuilder createBatchResponsePartBuilder();
-
- protected abstract ODataRequestBuilder createODataRequestBuilder();
-
- protected abstract BatchChangeSetBuilder createBatchChangeSetBuilder();
-
- protected abstract BatchQueryPartBuilder createBatchQueryRequestBuilder();
-
- protected abstract BatchChangeSetPartBuilder createBatchChangeSetRequest();
-
- }
-
- /**
- * Returns a simple type object for given type kind.
- * @param edmSimpleTypeKind type kind
- * @return an implementation object
- */
- public static EdmSimpleType getEdmSimpleType(final EdmSimpleTypeKind edmSimpleTypeKind) {
- return RuntimeDelegate.getInstance().getEdmSimpleType(edmSimpleTypeKind);
- }
-
- /**
- * Returns an implementation of the EDM simple-type facade.
- * @return an implementation object
- */
- public static EdmSimpleTypeFacade getSimpleTypeFacade() {
- return RuntimeDelegate.getInstance().getSimpleTypeFacade();
- }
-
- /**
- * Returns a builder for creating response objects with variable parameter sets.
- * @return an implementation object
- */
- public static ODataResponseBuilder createODataResponseBuilder() {
- return RuntimeDelegate.getInstance().createODataResponseBuilder();
- }
-
- /**
- * Creates and returns an entity data model.
- * @param provider a provider implemented by the OData service
- * @return an implementation object
- */
- public static Edm createEdm(final EdmProvider provider) {
- return RuntimeDelegate.getInstance().createEdm(provider);
- }
-
- /**
- * Returns an parser which can parse OData uris based on metadata.
- * @param edm metadata of the implemented service
- * @return an implementation object
- */
- public static UriParser getUriParser(final Edm edm) {
- return RuntimeDelegate.getInstance().getUriParser(edm);
- }
-
- /**
- * Creates and returns a http entity provider.
- * @return an implementation object
- */
- public static EntityProviderInterface createEntityProvider() {
- return RuntimeDelegate.getInstance().createEntityProvider();
- }
-
- /**
- * Creates and returns a single processor service.
- * @param provider a provider implementation for the metadata of the OData service
- * @param processor a single data processor implementation of the OData service
- * @return a implementation object
- */
- public static ODataService createODataSingleProcessorService(final EdmProvider provider,
- final ODataSingleProcessor processor) {
- return RuntimeDelegate.getInstance().createODataSingleProcessorService(provider, processor);
- }
-
- /**
- * Creates and returns an edm provider.
- * @param metadataXml a metadata xml input stream (means the metadata document)
- * @param validate true if semantic checks for metadata input stream shall be done
- * @return an instance of EdmProvider
- */
- public static EdmProvider createEdmProvider(final InputStream metadataXml, final boolean validate)
- throws EntityProviderException {
- return RuntimeDelegate.getInstance().createEdmProvider(metadataXml, validate);
- }
-
- private static class RuntimeDelegateException extends RuntimeException {
-
- private static final long serialVersionUID = 1L;
-
- public RuntimeDelegateException(final Exception e) {
- super(e);
- }
- }
-
- public static BatchResponsePartBuilder createBatchResponsePartBuilder() {
- return RuntimeDelegate.getInstance().createBatchResponsePartBuilder();
- }
-
- public static ODataRequestBuilder createODataRequestBuilder() {
- return RuntimeDelegate.getInstance().createODataRequestBuilder();
- }
-
- public static BatchChangeSetBuilder createBatchChangeSetBuilder() {
- return RuntimeDelegate.getInstance().createBatchChangeSetBuilder();
- }
-
- public static BatchQueryPartBuilder createBatchQueryPartBuilder() {
- return RuntimeDelegate.getInstance().createBatchQueryRequestBuilder();
- }
-
- public static BatchChangeSetPartBuilder createBatchChangeSetPartBuilder() {
- return RuntimeDelegate.getInstance().createBatchChangeSetRequest();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/package-info.java
deleted file mode 100644
index 02d6db7..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/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.
- ******************************************************************************/
-/**
- * Runtime Support<p>
- *
- * Provides a mechanism for loading of implementation classes for interfaces.
- */
-package org.apache.olingo.odata2.api.rt;
-
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
deleted file mode 100644
index 3048fd6..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.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.odata2.api.servicedocument;
-
-/**
- * An Accept element
- * <p>Accept element indicates the types of representation accepted by the Collection
- *
- */
-public interface Accept {
-
- /**
- * Get the media range
- *
- * @return value as String
- */
- public String getValue();
-
- /**
- * Get common attributes
- *
- * @return {@link CommonAttributes}
- */
- public CommonAttributes getCommonAttributes();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
deleted file mode 100644
index 84940d2..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
+++ /dev/null
@@ -1,50 +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.servicedocument;
-
-import java.util.List;
-
-/**
- * A AtomInfo
- * <p>AtomInfo represents the structure of Service Document according RFC 5023 (for ATOM format)
- *
- */
-public interface AtomInfo {
-
- /**
- * Get the list of workspaces
- *
- * @return a list of {@link Workspace}
- */
- public List<Workspace> getWorkspaces();
-
- /**
- * Get common attributes
- *
- * @return {@link CommonAttributes}
- */
- public CommonAttributes getCommonAttributes();
-
- /**
- * Get the list of extension elements
- *
- * @return a list of {@link ExtensionElement}
- */
- public List<ExtensionElement> getExtesionElements();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
deleted file mode 100644
index 6efdbd4..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
+++ /dev/null
@@ -1,61 +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.servicedocument;
-
-import java.util.List;
-
-/**
- * A Categories element
- * <p>Categories element provides a list of the categories that can be applied to the members of a Collection
- * <p>If the "href" attribute is provided, the Categories element MUST be empty and MUST NOT have the "fixed" or
- * "scheme" attributes
- *
- */
-
-public interface Categories {
-
- /**
- * Get the IRI reference identifying a Category Document
- *
- * @return href as String
- */
- public String getHref();
-
- /**
- * Get the attribute fixed that indicates whether the list of categories is a fixed or an open set
- *
- * @return {@link Fixed}
- */
- public Fixed getFixed();
-
- /**
- * Get the scheme
- *
- * @return scheme as String
- */
- public String getScheme();
-
- /**
- * Get the list of categories
- *
- * @return list of {@link Category}
- */
- public List<Category> getCategoryList();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
deleted file mode 100644
index c444117..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
+++ /dev/null
@@ -1,54 +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.servicedocument;
-
-/**
- * A Category element
- * <p>Category element
- *
- */
-public interface Category {
- /**
- * Get the scheme
- *
- * @return scheme as String
- */
- public String getScheme();
-
- /**
- * Get the term
- *
- * @return term as String
- */
- public String getTerm();
-
- /**
- * Get common attributes
- *
- * @return {@link CommonAttributes}
- */
- public CommonAttributes getCommonAttributes();
-
- /**
- * Get the label
- *
- * @return label as String
- */
- public String getLabel();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
deleted file mode 100644
index 0c7c9a9..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
+++ /dev/null
@@ -1,71 +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.servicedocument;
-
-import java.util.List;
-
-/**
- * A Collection
- * <p>Collection element describes a Collection
- *
- */
-public interface Collection {
- /**
- * Get the human-readable title for the Collection
- *
- * @return {@link Title}
- */
- public Title getTitle();
-
- /**
- * Get the "href" attribute, whose value gives IRI of the Collection
- *
- * @return href as String
- */
- public String getHref();
-
- /**
- * Get common attributes
- *
- * @return {@link CommonAttributes}
- */
- public CommonAttributes getCommonAttributes();
-
- /**
- * Get the media range that specifies a type of representation
- * that can be POSTed to a Collection
- * @return a list of {@link Accept}
- */
- public List<Accept> getAcceptElements();
-
- /**
- *
- *
- * @return a list of {@link Categories}
- */
- public List<Categories> getCategories();
-
- /**
- * Get the list of extension elements
- *
- * @return a list of {@link ExtensionElement}
- */
- public List<ExtensionElement> getExtesionElements();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
deleted file mode 100644
index 64ccb4f..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.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.odata2.api.servicedocument;
-
-import java.util.List;
-
-/**
- * A CommonAttributes
- *
- */
-public interface CommonAttributes {
- /**
- * Get the a base URI
- *
- * @return base as String
- */
- public String getBase();
-
- /**
- * Get the natural language for the element
- *
- * @return language as String
- */
- public String getLang();
-
- /**
- * Get the list of any attributes
- *
- * @return list of {@link ExtensionAttribute}
- */
- public List<ExtensionAttribute> getAttributes();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
deleted file mode 100644
index 26fb465..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
+++ /dev/null
@@ -1,54 +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.servicedocument;
-
-/**
- * A ExtensionAttribute
- * <p>ExtensionAttribute is an attribute of an extension element
- *
- */
-public interface ExtensionAttribute {
- /**
- * Get the namespace
- *
- * @return namespace as String
- */
- public String getNamespace();
-
- /**
- * Get the prefix of the attribute
- *
- * @return prefix as String
- */
- public String getPrefix();
-
- /**
- * Get the local name of the attribute
- *
- * @return name as String
- */
- public String getName();
-
- /**
- * Get the text
- *
- * @return text as String
- */
- public String getText();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
deleted file mode 100644
index fc2a4a0..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
+++ /dev/null
@@ -1,71 +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.servicedocument;
-
-import java.util.List;
-
-/**
- * A ExtensionElement
- * <p>ExtensionElement is an element that is defined in any namespace except
- * the namespace "app"
- *
- */
-public interface ExtensionElement {
- /**
- * Get the namespace
- *
- * @return namespace as String
- */
- public String getNamespace();
-
- /**
- * Get the prefix of the element
- *
- * @return prefix as String
- */
- public String getPrefix();
-
- /**
- * Get the local name of the element
- *
- * @return name as String
- */
- public String getName();
-
- /**
- * Get the text
- *
- * @return text as String
- */
- public String getText();
-
- /**
- * Get nested elements
- *
- * @return a list of {@link ExtensionElement}
- */
- public List<ExtensionElement> getElements();
-
- /**
- * Get attributes
- *
- * @return a list of {@link ExtensionAttribute}
- */
- public List<ExtensionAttribute> getAttributes();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
deleted file mode 100644
index 20b7ed6..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.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.
- ******************************************************************************/
-package org.apache.olingo.odata2.api.servicedocument;
-
-/**
- * Fixed
- * <p>Fixed indicates whether the list of categories is a fixed or an open set
- * Fixed can either be yes or no
- *
- */
-public enum Fixed {
- YES, NO;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
deleted file mode 100644
index 6f4c4b5..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
+++ /dev/null
@@ -1,45 +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.servicedocument;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.EdmEntitySetInfo;
-import org.apache.olingo.odata2.api.ep.EntityProviderException;
-
-/**
- * A Service document
- * <p>Service document lists all EntitySets
- *
- */
-public interface ServiceDocument {
- /**
- * Get the list of the EntitySets
- *
- * @return a list of {@link EdmEntitySetInfo}
- */
- public List<EdmEntitySetInfo> getEntitySetsInfo() throws EntityProviderException;
-
- /**
- * Get additional information if the service document is in atom format
- *
- * @return {@link AtomInfo} or null
- */
- public AtomInfo getAtomInfo();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
deleted file mode 100644
index aa0ba26..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.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.odata2.api.servicedocument;
-
-import java.io.InputStream;
-
-/**
- *
- */
-public interface ServiceDocumentParser {
- public ServiceDocument parseXml(InputStream in) throws ServiceDocumentParserException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
deleted file mode 100644
index 001da46..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ******************************************************************************/
-package org.apache.olingo.odata2.api.servicedocument;
-
-/**
- *
- */
-public class ServiceDocumentParserException extends Exception {
-
- private static final long serialVersionUID = 1L;
-
- public ServiceDocumentParserException(final String message) {
- super(message);
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
deleted file mode 100644
index bab441f..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ******************************************************************************/
-package org.apache.olingo.odata2.api.servicedocument;
-
-/**
- * A Title element
- * <p>Title element gives a human-readable title
- *
- */
-public interface Title {
- /**
- * @return text as String
- */
- public String getText();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
deleted file mode 100644
index 67447cb..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
+++ /dev/null
@@ -1,57 +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.servicedocument;
-
-import java.util.List;
-
-/**
- * A Workspace element
- * <p>Workspaces are server-defined groups of Collections.
- *
- */
-public interface Workspace {
- /**
- * Get the human-readable title for the Workspace
- *
- * @return {@link Title}
- */
- public Title getTitle();
-
- /**
- * Get the list of the Collections
- *
- * @return a list of {@link Collection}
- */
- public List<Collection> getCollections();
-
- /**
- * Get common attributes
- *
- * @return {@link CommonAttributes}
- */
- public CommonAttributes getCommonAttributes();
-
- /**
- * Get the list of extension elements
- *
- * @return a list of {@link ExtensionElement}
- */
- public List<ExtensionElement> getExtesionElements();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
deleted file mode 100644
index aa99a50..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.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.odata2.api.uri;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.olingo.odata2.api.edm.EdmProperty;
-
-/**
- * Expression tree node with information about selected properties and to be expanded links.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface ExpandSelectTreeNode {
-
- /**
- * Determines whether all properties (including navigation properties) have been selected.
- */
- public boolean isAll();
-
- /**
- * <p>Gets the list of explicitly selected {@link EdmProperty properties}.</p>
- * <p>This list does not contain any navigation properties.
- * It is empty if {@link #isAll()} returns <code>true</code>.</p>
- * @return List of selected properties
- */
- public List<EdmProperty> getProperties();
-
- /**
- * Gets the links that have to be included or expanded.
- * @return a Map from EdmNavigationProperty Name to its related {@link ExpandSelectTreeNode};
- * if that node is <code>null</code>, a deferred link has been requested,
- * otherwise the link must be expanded with information found in that node
- */
- public Map<String, ExpandSelectTreeNode> getLinks();
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
deleted file mode 100644
index 89497f6..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
+++ /dev/null
@@ -1,45 +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;
-
-import org.apache.olingo.odata2.api.edm.EdmProperty;
-
-/**
- * Key predicate, consisting of a simple-type property and its value as String literal
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface KeyPredicate {
-
- /**
- * <p>Gets the literal String in default representation.</p>
- * <p>The description for {@link org.apache.olingo.odata2.api.edm.EdmLiteral} has some motivation for using
- * this representation.</p>
- * @return String literal in default (<em>not</em> URI) representation
- * @see org.apache.olingo.odata2.api.edm.EdmLiteralKind
- */
- public String getLiteral();
-
- /**
- * Gets the key property.
- * @return {@link EdmProperty} simple-type property
- */
- public EdmProperty getProperty();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
deleted file mode 100644
index 1716ad1..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.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.odata2.api.uri;
-
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
-
-/**
- * Navigation property segment, consisting of a navigation property and its
- * target entity set.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface NavigationPropertySegment {
-
- /**
- * Gets the navigation property.
- * @return {@link EdmNavigationProperty} navigation property
- */
- public EdmNavigationProperty getNavigationProperty();
-
- /**
- * Gets the target entity set.
- * @return {@link EdmEntitySet} the target entity set
- */
- public EdmEntitySet getTargetEntitySet();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
deleted file mode 100644
index 2881ca1..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.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.odata2.api.uri;
-
-import java.util.List;
-
-import org.apache.olingo.odata2.api.edm.EdmEntitySet;
-import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
-
-/**
- * Navigation segment, consisting of a navigation property, its target entity set,
- * and, optionally, a list of key predicates to determine a single entity out of
- * the target entity set.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface NavigationSegment {
-
- /**
- * Gets the navigation property.
- * @return {@link EdmNavigationProperty} navigation property of this navigation segment
- */
- public EdmNavigationProperty getNavigationProperty();
-
- /**
- * Gets the target entity set.
- * @return {@link EdmEntitySet} entity set of this navigation segment
- */
- public EdmEntitySet getEntitySet();
-
- /**
- * Gets the key predicate for the target entity set.
- * @return List of {@link KeyPredicate}: key predicate of this navigation segment
- */
- public List<KeyPredicate> getKeyPredicates();
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/57599da6/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
deleted file mode 100644
index 0e59a24..0000000
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.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;
-
-import java.net.URI;
-import java.util.List;
-
-/**
- * Object to keep OData URI information.
- * @org.apache.olingo.odata2.DoNotImplement
- *
- */
-public interface PathInfo {
-
- /**
- * Gets preceding path segments.
- * @return List of path segments
- */
- List<PathSegment> getPrecedingSegments();
-
- /**
- * Gets OData path segments as immutable list.
- * @return List of path segments
- */
- List<PathSegment> getODataSegments();
-
- /**
- * Gets the root URI of this service.
- * @return absolute base URI of the request
- */
- URI getServiceRoot();
-
- /**
- * Get the absolute request URI including any query parameters.
- * @return the absolute request URI
- */
- URI getRequestUri();
-
-}