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 2015/02/17 10:53:45 UTC
[31/35] olingo-odata4 git commit: [OLINGO-575] Removed V4 server code
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java
deleted file mode 100644
index 43c94ba..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ReferenceProcessor.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.processor;
-
-import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.server.api.ODataApplicationException;
-import org.apache.olingo.server.api.ODataRequest;
-import org.apache.olingo.server.api.ODataResponse;
-import org.apache.olingo.server.api.deserializer.DeserializerException;
-import org.apache.olingo.server.api.serializer.SerializerException;
-import org.apache.olingo.server.api.uri.UriInfo;
-
-/**
- * Processor interface for handling a single instance of an Entity Reference.
- */
-public interface ReferenceProcessor extends Processor {
-
- /**
- * Reads entity reference from persistence and put it as serialized content and status into the response.
- * @param request OData request object containing raw HTTP information
- * @param response OData response object for collecting response data
- * @param uriInfo information of a parsed OData URI
- * @param responseFormat requested content type after content negotiation
- * @throws ODataApplicationException if the service implementation encounters a failure
- * @throws SerializerException if serialization failed
- */
- void readReference(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat)
- throws ODataApplicationException, SerializerException;
-
- /**
- * Creates entity reference in the persistence and puts content, status, and Location into the response.
- * @param request OData request object containing raw HTTP information
- * @param response OData response object for collecting response data
- * @param uriInfo information of a parsed OData URI
- * @param requestFormat content type of body sent with request
- * @throws ODataApplicationException if the service implementation encounters a failure
- * @throws DeserializerException if de-serialization failed
- */
- void createReference(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType requestFormat)
- throws ODataApplicationException, DeserializerException;
-
- /**
- * Update entity reference in the persistence and puts content, status, and Location into the response.
- * @param request OData request object containing raw HTTP information
- * @param response OData response object for collecting response data
- * @param uriInfo information of a parsed OData URI
- * @param requestFormat content type of body sent with request
- * @throws ODataApplicationException if the service implementation encounters a failure
- * @throws DeserializerException if de-serialization failed
- */
- void updateReference(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType requestFormat)
- throws ODataApplicationException, DeserializerException;
-
- /**
- * Deletes reference to an entity from persistence and puts the status into the response.
- * Delete on a reference only removes the reference to and not the entity itself
- * (see chapter "11.4.6.2 Remove a Reference to an Entity")
- * @param request OData request object containing raw HTTP information
- * @param response OData response object for collecting response data
- * @param uriInfo information of a parsed OData URI
- * @throws ODataApplicationException if the service implementation encounters a failure
- */
- void deleteReference(ODataRequest request, ODataResponse response, UriInfo uriInfo)
- throws ODataApplicationException;
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.java
deleted file mode 100644
index 5f0d4f9..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ServiceDocumentProcessor.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.server.api.processor;
-
-import org.apache.olingo.commons.api.format.ContentType;
-import org.apache.olingo.server.api.ODataApplicationException;
-import org.apache.olingo.server.api.ODataRequest;
-import org.apache.olingo.server.api.ODataResponse;
-import org.apache.olingo.server.api.serializer.SerializerException;
-import org.apache.olingo.server.api.uri.UriInfo;
-
-/**
- * Processor interface for handling the service document.
- */
-public interface ServiceDocumentProcessor extends Processor {
-
- /**
- * Reads service-document information from persistence and puts serialized content and status into the response.
- * @param request OData request object containing raw HTTP information
- * @param response OData response object for collecting response data
- * @param uriInfo information of a parsed OData URI
- * @param responseFormat requested content type after content negotiation
- * @throws ODataApplicationException if the service implementation encounters a failure
- * @throws SerializerException if serialization failed
- */
- void readServiceDocument(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat)
- throws ODataApplicationException, SerializerException;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java
deleted file mode 100644
index d6788e5..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ComplexSerializerOptions.java
+++ /dev/null
@@ -1,86 +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.server.api.serializer;
-
-import org.apache.olingo.commons.api.data.ContextURL;
-import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-
-/** Options for the OData serializer. */
-public class ComplexSerializerOptions {
-
- private ContextURL contextURL;
- private ExpandOption expand;
- private SelectOption select;
-
- /** Gets the {@link ContextURL}. */
- public ContextURL getContextURL() {
- return contextURL;
- }
-
- /** Gets the $expand system query option. */
- public ExpandOption getExpand() {
- return expand;
- }
-
- /** Gets the $select system query option. */
- public SelectOption getSelect() {
- return select;
- }
-
- private ComplexSerializerOptions() {}
-
- /** Initializes the options builder. */
- public static Builder with() {
- return new Builder();
- }
-
- /** Builder of OData serializer options. */
- public static final class Builder {
-
- private ComplexSerializerOptions options;
-
- private Builder() {
- options = new ComplexSerializerOptions();
- }
-
- /** Sets the {@link ContextURL}. */
- public Builder contextURL(final ContextURL contextURL) {
- options.contextURL = contextURL;
- return this;
- }
-
- /** Sets the $expand system query option. */
- public Builder expand(final ExpandOption expand) {
- options.expand = expand;
- return this;
- }
-
- /** Sets the $select system query option. */
- public Builder select(final SelectOption select) {
- options.select = select;
- return this;
- }
-
- /** Builds the OData serializer options. */
- public ComplexSerializerOptions build() {
- return options;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
deleted file mode 100644
index ca4f0cb..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/CustomContentTypeSupport.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.serializer;
-
-import java.util.List;
-
-import org.apache.olingo.commons.api.format.ContentType;
-
-/**
- * <p>Processors that supports custom content types can implement this interface.</p>
- * <p>The processor can also remove default content types if the default (de-)serializers
- * of Olingo are not used. By default this interface is not implemented and
- * a processor supports content types implemented by Olingo's default (de-)serializer
- * (e.g., <code>application/xml</code> for the metadata and
- * </code>application/json</code> for the service document).</p>
- * <p>Requesting a content type that is not supported results in an HTTP error
- * 406 (Not Acceptable); sending content of an unsupported type results in an
- * HTTP error 415 (Unsupported Media Type).</p>
- */
-public interface CustomContentTypeSupport {
-
- /**
- * Returns a list of supported content types.
- * @param defaultContentTypes content types supported by Olingo's (de-)serializer
- * @param type the current type of representation
- * @return modified list of supported content types
- */
- public List<ContentType> modifySupportedContentTypes(
- List<ContentType> defaultContentTypes, RepresentationType type);
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
deleted file mode 100644
index 14c588d..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntityCollectionSerializerOptions.java
+++ /dev/null
@@ -1,97 +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.server.api.serializer;
-
-import org.apache.olingo.commons.api.data.ContextURL;
-import org.apache.olingo.server.api.uri.queryoption.CountOption;
-import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-
-/** Options for the OData serializer. */
-public class EntityCollectionSerializerOptions {
-
- private ContextURL contextURL;
- private CountOption count;
- private ExpandOption expand;
- private SelectOption select;
-
- /** Gets the {@link ContextURL}. */
- public ContextURL getContextURL() {
- return contextURL;
- }
-
- /** Gets the $count system query option. */
- public CountOption getCount() {
- return count;
- }
-
- /** Gets the $expand system query option. */
- public ExpandOption getExpand() {
- return expand;
- }
-
- /** Gets the $select system query option. */
- public SelectOption getSelect() {
- return select;
- }
-
- /** Initializes the options builder. */
- public static Builder with() {
- return new Builder();
- }
-
- /** Builder of OData serializer options. */
- public static final class Builder {
-
- private EntityCollectionSerializerOptions options;
-
- private Builder() {
- options = new EntityCollectionSerializerOptions();
- }
-
- /** Sets the {@link ContextURL}. */
- public Builder contextURL(final ContextURL contextURL) {
- options.contextURL = contextURL;
- return this;
- }
-
- /** Sets the $count system query option. */
- public Builder count(final CountOption count) {
- options.count = count;
- return this;
- }
-
- /** Sets the $expand system query option. */
- public Builder expand(final ExpandOption expand) {
- options.expand = expand;
- return this;
- }
-
- /** Sets the $select system query option. */
- public Builder select(final SelectOption select) {
- options.select = select;
- return this;
- }
-
- /** Builds the OData serializer options. */
- public EntityCollectionSerializerOptions build() {
- return options;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
deleted file mode 100644
index 7805fb0..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
+++ /dev/null
@@ -1,85 +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.server.api.serializer;
-
-import org.apache.olingo.commons.api.data.ContextURL;
-import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-
-/** Options for the OData serializer. */
-public class EntitySerializerOptions {
- private ContextURL contextURL;
- private ExpandOption expand;
- private SelectOption select;
-
- /** Gets the {@link ContextURL}. */
- public ContextURL getContextURL() {
- return contextURL;
- }
-
- /** Gets the $expand system query option. */
- public ExpandOption getExpand() {
- return expand;
- }
-
- /** Gets the $select system query option. */
- public SelectOption getSelect() {
- return select;
- }
-
- private EntitySerializerOptions() {}
-
- /** Initializes the options builder. */
- public static final Builder with() {
- return new Builder();
- }
-
- /** Builder of OData serializer options. */
- public static final class Builder {
-
- private EntitySerializerOptions options;
-
- private Builder() {
- options = new EntitySerializerOptions();
- }
-
- /** Sets the {@link ContextURL}. */
- public Builder contextURL(final ContextURL contextURL) {
- options.contextURL = contextURL;
- return this;
- }
-
- /** Sets the $expand system query option. */
- public Builder expand(final ExpandOption expand) {
- options.expand = expand;
- return this;
- }
-
- /** Sets the $select system query option. */
- public Builder select(final SelectOption select) {
- options.select = select;
- return this;
- }
-
- /** Builds the OData serializer options. */
- public EntitySerializerOptions build() {
- return options;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.java
deleted file mode 100644
index 19ae37d..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/FixedFormatSerializer.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.server.api.serializer;
-
-import java.io.InputStream;
-import java.util.List;
-
-import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
-import org.apache.olingo.server.api.batch.exception.BatchSerializerException;
-import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart;
-
-/** OData serializer for fixed output formats. */
-public interface FixedFormatSerializer {
-
- /**
- * Writes binary output into an InputStream.
- * @param binary the binary data
- */
- InputStream binary(byte[] binary) throws SerializerException;
-
- /**
- * Writes a count into an InputStream as plain text.
- * @param count the count
- */
- InputStream count(Integer count) throws SerializerException;
-
- /**
- * Writes the raw value of a primitive-type instance into an InputStream.
- * @param type the primitive type
- * @param value the value
- * @param options options for the serializer
- */
- InputStream primitiveValue(EdmPrimitiveType type, Object value, PrimitiveValueSerializerOptions options)
- throws SerializerException;
-
- // TODO: Document
- // TODO: Return type
- InputStream batchResponse(List<ODataResponsePart> batchResponses, String boundary) throws BatchSerializerException;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
deleted file mode 100644
index 72f8ee8..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java
+++ /dev/null
@@ -1,112 +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.server.api.serializer;
-
-import java.io.InputStream;
-
-import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.data.EntitySet;
-import org.apache.olingo.commons.api.data.Property;
-import org.apache.olingo.commons.api.edm.Edm;
-import org.apache.olingo.commons.api.edm.EdmComplexType;
-import org.apache.olingo.commons.api.edm.EdmEntityType;
-import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
-import org.apache.olingo.server.api.ODataServerError;
-import org.apache.olingo.server.api.ServiceMetadata;
-
-/** OData serializer */
-public interface ODataSerializer {
-
- /** The default character set is UTF-8. */
- public static final String DEFAULT_CHARSET = "UTF-8";
-
- /**
- * Writes the service document into an InputStream.
- * @param edm the Entity Data Model
- * @param serviceRoot the service-root URI of this OData service
- */
- InputStream serviceDocument(Edm edm, String serviceRoot) throws SerializerException;
-
- /**
- * Writes the metadata document into an InputStream.
- * @param serviceMetadata the metadata information for the service
- */
- InputStream metadataDocument(ServiceMetadata serviceMetadata) throws SerializerException;
-
- /**
- * Writes an ODataError into an InputStream.
- * @param error the main error
- * @return inputStream containing the OData-formatted error
- */
- InputStream error(ODataServerError error) throws SerializerException;
-
- /**
- * Writes entity-collection data into an InputStream.
- * @param entityType the {@link EdmEntityType}
- * @param entitySet the data of the entity set
- * @param options options for the serializer
- */
- InputStream entityCollection(EdmEntityType entityType, EntitySet entitySet,
- EntityCollectionSerializerOptions options) throws SerializerException;
-
- /**
- * Writes entity data into an InputStream.
- * @param entityType the {@link EdmEntityType}
- * @param entity the data of the entity
- * @param options options for the serializer
- */
- InputStream entity(EdmEntityType entityType, Entity entity, EntitySerializerOptions options)
- throws SerializerException;
-
- /**
- * Writes primitive-type instance data into an InputStream.
- * @param type primitive type
- * @param property property value
- * @param options options for the serializer
- */
- InputStream primitive(EdmPrimitiveType type, Property property, PrimitiveSerializerOptions options)
- throws SerializerException;
-
- /**
- * Writes complex-type instance data into an InputStream.
- * @param type complex type
- * @param property property value
- * @param options options for the serializer
- */
- InputStream complex(EdmComplexType type, Property property, ComplexSerializerOptions options)
- throws SerializerException;
-
- /**
- * Writes data of a collection of primitive-type instances into an InputStream.
- * @param type primitive type
- * @param property property value
- * @param options options for the serializer
- */
- InputStream primitiveCollection(EdmPrimitiveType type, Property property, PrimitiveSerializerOptions options)
- throws SerializerException;
-
- /**
- * Writes data of a collection of complex-type instances into an InputStream.
- * @param type complex type
- * @param property property value
- * @param options options for the serializer
- */
- InputStream complexCollection(EdmComplexType type, Property property, ComplexSerializerOptions options)
- throws SerializerException;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.java
deleted file mode 100644
index 9339592..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveSerializerOptions.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.server.api.serializer;
-
-import org.apache.olingo.commons.api.data.ContextURL;
-import org.apache.olingo.commons.api.edm.EdmProperty;
-
-/** Options for the OData serializer. */
-public class PrimitiveSerializerOptions {
-
- private ContextURL contextURL;
- private Boolean isNullable;
- private Integer maxLength;
- private Integer precision;
- private Integer scale;
- private Boolean isUnicode;
-
- /** Gets the {@link ContextURL}. */
- public ContextURL getContextURL() {
- return contextURL;
- }
-
- /** Gets the nullable facet. */
- public Boolean isNullable() {
- return isNullable;
- }
-
- /** Gets the maxLength facet. */
- public Integer getMaxLength() {
- return maxLength;
- }
-
- /** Gets the precision facet. */
- public Integer getPrecision() {
- return precision;
- }
-
- /** Gets the scale facet. */
- public Integer getScale() {
- return scale;
- }
-
- /** Gets the unicode facet. */
- public Boolean isUnicode() {
- return isUnicode;
- }
-
- private PrimitiveSerializerOptions() {}
-
- /** Initializes the options builder. */
- public static Builder with() {
- return new Builder();
- }
-
- /** Builder of OData serializer options. */
- public static final class Builder {
-
- private PrimitiveSerializerOptions options;
-
- private Builder() {
- options = new PrimitiveSerializerOptions();
- }
-
- /** Sets the {@link ContextURL}. */
- public Builder contextURL(final ContextURL contextURL) {
- options.contextURL = contextURL;
- return this;
- }
-
- /** Sets the nullable facet. */
- public Builder nullable(final Boolean isNullable) {
- options.isNullable = isNullable;
- return this;
- }
-
- /** Sets the maxLength facet. */
- public Builder maxLength(final Integer maxLength) {
- options.maxLength = maxLength;
- return this;
- }
-
- /** Sets the precision facet. */
- public Builder precision(final Integer precision) {
- options.precision = precision;
- return this;
- }
-
- /** Sets the scale facet. */
- public Builder scale(final Integer scale) {
- options.scale = scale;
- return this;
- }
-
- /** Sets the unicode facet. */
- public Builder unicode(final Boolean isUnicode) {
- options.isUnicode = isUnicode;
- return this;
- }
-
- /** Sets all facets from an EDM property. */
- public Builder facetsFrom(final EdmProperty property) {
- options.isNullable = property.isNullable();
- options.maxLength = property.getMaxLength();
- options.precision = property.getPrecision();
- options.scale = property.getScale();
- options.isUnicode = property.isUnicode();
- return this;
- }
-
- /** Builds the OData serializer options. */
- public PrimitiveSerializerOptions build() {
- return options;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java
deleted file mode 100644
index e84aaa4..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/PrimitiveValueSerializerOptions.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.serializer;
-
-import org.apache.olingo.commons.api.edm.EdmProperty;
-
-/** Options for the OData serializer. */
-public class PrimitiveValueSerializerOptions {
-
- private Boolean isNullable;
- private Integer maxLength;
- private Integer precision;
- private Integer scale;
- private Boolean isUnicode;
-
- /** Gets the nullable facet. */
- public Boolean isNullable() {
- return isNullable;
- }
-
- /** Gets the maxLength facet. */
- public Integer getMaxLength() {
- return maxLength;
- }
-
- /** Gets the precision facet. */
- public Integer getPrecision() {
- return precision;
- }
-
- /** Gets the scale facet. */
- public Integer getScale() {
- return scale;
- }
-
- /** Gets the unicode facet. */
- public Boolean isUnicode() {
- return isUnicode;
- }
-
- private PrimitiveValueSerializerOptions() {}
-
- /** Initializes the options builder. */
- public static Builder with() {
- return new Builder();
- }
-
- /** Builder of OData serializer options. */
- public static final class Builder {
-
- private PrimitiveValueSerializerOptions options;
-
- private Builder() {
- options = new PrimitiveValueSerializerOptions();
- }
-
- /** Sets the nullable facet. */
- public Builder nullable(final Boolean isNullable) {
- options.isNullable = isNullable;
- return this;
- }
-
- /** Sets the maxLength facet. */
- public Builder maxLength(final Integer maxLength) {
- options.maxLength = maxLength;
- return this;
- }
-
- /** Sets the precision facet. */
- public Builder precision(final Integer precision) {
- options.precision = precision;
- return this;
- }
-
- /** Sets the scale facet. */
- public Builder scale(final Integer scale) {
- options.scale = scale;
- return this;
- }
-
- /** Sets the unicode facet. */
- public Builder unicode(final Boolean isUnicode) {
- options.isUnicode = isUnicode;
- return this;
- }
-
- /** Sets all facets from an EDM property. */
- public Builder facetsFrom(final EdmProperty property) {
- options.isNullable = property.isNullable();
- options.maxLength = property.getMaxLength();
- options.precision = property.getPrecision();
- options.scale = property.getScale();
- options.isUnicode = property.isUnicode();
- return this;
- }
-
- /** Builds the OData serializer options. */
- public PrimitiveValueSerializerOptions build() {
- return options;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.java
deleted file mode 100644
index 22efa28..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/RepresentationType.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.server.api.serializer;
-
-/**
- * The different types of representations that form the body of either the
- * OData request or the OData response, primarily used for content negotiation.
- */
-public enum RepresentationType {
- /** service document */ SERVICE,
- /** metadata document */ METADATA,
- /** batch request or response */ BATCH,
- /** error document */ ERROR,
- /** single entity */ ENTITY,
- /** collection of entities (entity set) */ COLLECTION_ENTITY,
- /** single primitive-type instance */ PRIMITIVE,
- /** collection of primitive-type instances */ COLLECTION_PRIMITIVE,
- /** single complex-type instance */ COMPLEX,
- /** collection of complex-type instances */ COLLECTION_COMPLEX,
- /** differences */ DIFFERENCES,
- /** media entity */ MEDIA,
- /** binary-type instance */ BINARY,
- /** single reference */ REFERENCE,
- /** collection of references */ COLLECTION_REFERENCE,
- /** textual raw value of a primitive-type instance (except binary) */ VALUE,
- /** count of instances */ COUNT,
- /** parameters of an action */ ACTION_PARAMETERS
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.java
deleted file mode 100644
index 1583241..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/SerializerException.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.server.api.serializer;
-
-import org.apache.olingo.server.api.ODataTranslatedException;
-
-/** Exception thrown by the {@link ODataSerializer}. */
-public class SerializerException extends ODataTranslatedException {
-
- private static final long serialVersionUID = 5358683245923127425L;
-
- /** Keys for exception texts in the resource bundle. */
- public static enum MessageKeys implements MessageKey {
- NOT_IMPLEMENTED,
- /** parameter: format */ UNSUPPORTED_FORMAT,
- JSON_METADATA,
- IO_EXCEPTION,
- NULL_INPUT,
- NO_CONTEXT_URL,
- /** parameter: property name */ UNSUPPORTED_PROPERTY_TYPE,
- /** parameter: property name */ INCONSISTENT_PROPERTY_TYPE,
- /** parameter: property name */ MISSING_PROPERTY,
- /** parameters: property name, property value */ WRONG_PROPERTY_VALUE,
- /** parameters: primitive-type name, value */ WRONG_PRIMITIVE_VALUE;
-
- @Override
- public String getKey() {
- return name();
- }
- }
-
- /**
- * Creates serializer exception.
- * @param developmentMessage message text as fallback and for debugging purposes
- * @param messageKey one of the {@link MessageKeys} for the exception text in the resource bundle
- * @param parameters parameters for the exception text
- */
- public SerializerException(final String developmentMessage,
- final MessageKey messageKey, final String... parameters) {
- super(developmentMessage, messageKey, parameters);
- }
-
- /**
- * Creates serializer exception.
- * @param developmentMessage message text as fallback and for debugging purposes
- * @param cause the cause of this exception
- * @param messageKey one of the {@link MessageKeys} for the exception text in the resource bundle
- * @param parameters parameters for the exception text
- */
- public SerializerException(final String developmentMessage, final Throwable cause,
- final MessageKey messageKey, final String... parameters) {
- super(developmentMessage, cause, messageKey, parameters);
- }
-
- @Override
- protected String getBundleName() {
- return DEFAULT_SERVER_BUNDLE_NAME;
- }
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java
deleted file mode 100644
index 16ec276..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriHelper.java
+++ /dev/null
@@ -1,59 +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.server.api.uri;
-
-import java.util.List;
-
-import org.apache.olingo.commons.api.data.Entity;
-import org.apache.olingo.commons.api.edm.EdmEntitySet;
-import org.apache.olingo.commons.api.edm.EdmStructuredType;
-import org.apache.olingo.server.api.serializer.SerializerException;
-import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-
-/**
- * Used for URI-related tasks.
- */
-public interface UriHelper {
-
- /**
- * Builds the select-list part of a {@link org.apache.olingo.commons.api.data.ContextURL ContextURL}.
- * @param type the {@link EdmStructuredType}
- * @param expand the $expand option
- * @param select the $select option
- * @return a String with the select list
- */
- String buildContextURLSelectList(EdmStructuredType type, ExpandOption expand, SelectOption select)
- throws SerializerException;
-
- /**
- * Builds the key-predicate part of a {@link org.apache.olingo.commons.api.data.ContextURL ContextURL}.
- * @param keys the keys as a list of {@link UriParameter} instances
- * @return a String with the key predicate
- */
- String buildContextURLKeyPredicate(List<UriParameter> keys) throws SerializerException;
-
- /**
- * Builds the relative canonical URL for the given entity in the given entity set.
- * @param edmEntitySet the entity set
- * @param entity the entity data
- * @return the relative canonical URL
- */
- String buildCanonicalURL(EdmEntitySet edmEntitySet, Entity entity) throws SerializerException;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
deleted file mode 100644
index a4af588..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java
+++ /dev/null
@@ -1,52 +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.server.api.uri;
-
-import org.apache.olingo.server.api.uri.queryoption.SystemQueryOption;
-
-import java.util.Collection;
-
-/**
- * Object acting as general access to URI information extracted from the request URI. Depending on
- * the URI info kind different interfaces are used to provide access to that information. </p>
- * Use method {@link #getKind()} to obtain URI info kind information and to perform an appropriate cast.
- */
-public interface UriInfo extends
- UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin,
- UriInfoEntityId, UriInfoMetadata, UriInfoResource {
-
- public UriInfoKind getKind();
-
- public UriInfoService asUriInfoService();
-
- public UriInfoAll asUriInfoAll();
-
- public UriInfoBatch asUriInfoBatch();
-
- public UriInfoCrossjoin asUriInfoCrossjoin();
-
- public UriInfoEntityId asUriInfoEntityId();
-
- public UriInfoMetadata asUriInfoMetadata();
-
- public UriInfoResource asUriInfoResource();
-
- public Collection<SystemQueryOption> getSystemQueryOptions();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
deleted file mode 100644
index d76eb55..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoAll.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-/**
- * Used for URI info kind {@link UriInfoKind#all} to describe URIs like
- * http://.../serviceroot/$all
- */
-public interface UriInfoAll {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
deleted file mode 100644
index 3d31838..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoBatch.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-/**
- * Used for URI info kind {@link UriInfoKind#batch} to describe URIs like
- * http://.../serviceroot/$batch
- */
-public interface UriInfoBatch {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
deleted file mode 100644
index 1352486..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoCrossjoin.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-import java.util.List;
-
-/**
- * Used for URI info kind {@link UriInfoKind#crossjoin} to describe URIs like
- * http://.../serviceroot/$crossjoin(...)
- */
-public interface UriInfoCrossjoin {
-
- /**
- * @return List of entity set names
- */
- List<String> getEntitySetNames();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
deleted file mode 100644
index 3412517..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-import org.apache.olingo.commons.api.edm.EdmEntityType;
-import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption;
-import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.FormatOption;
-import org.apache.olingo.server.api.uri.queryoption.IdOption;
-import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-
-import java.util.List;
-
-/**
- * Used for URI info kind {@link UriInfoKind#entityId} to describe URIs like
- * http://.../serviceroot/$entity...
- */
-public interface UriInfoEntityId {
-
- /**
- * @return List of custom query options used in the URI
- */
- public List<CustomQueryOption> getCustomQueryOptions();
-
- /**
- * Behind $entity a optional type cast can be used in the URI.
- * For example: http://.../serviceroot/$entity/namespace.entitytype
- * @return Type cast if found, otherwise null
- */
- public EdmEntityType getEntityTypeCast();
-
- /**
- * @return Object containing information of the $expand option
- */
- public ExpandOption getExpandOption();
-
- /**
- * @return Object containing information of the $format option
- */
- public FormatOption getFormatOption();
-
- /**
- * @return Object containing information of the $id option
- */
- public IdOption getIdOption();
-
- /**
- * @return Object containing information of the $select option
- */
- public SelectOption getSelectOption();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
deleted file mode 100644
index bb13374..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-/**
- * Defining the various info kinds
- */
-public enum UriInfoKind {
-
- /**
- * Class: {@link UriInfoAll}<br>
- * URI: http://.../serviceroot/$all
- */
- all,
-
- /**
- * Class: {@link UriInfoBatch}<br>
- * URI: http://.../serviceroot/$batch
- */
- batch,
-
- /**
- * Class: {@link UriInfoCrossjoin}<br>
- * URI: http://.../serviceroot/$crossjoin
- */
- crossjoin,
-
- /**
- * Class: {@link UriInfoEntityId}<br>
- * URI: http://.../serviceroot/$entity(...)
- */
- entityId,
-
- /**
- * Class: {@link UriInfoMetadata}<br>
- * URI: http://.../serviceroot/$metadata...
- */
- metadata,
-
- /**
- * Class: {@link UriInfoResource}<br>
- * URI: http://.../serviceroot/entitySet
- */
- resource,
-
- /**
- * Class: {@link UriInfoService}<br>
- * URI: http://.../serviceroot
- */
- service;
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
deleted file mode 100644
index 8906a64..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-import org.apache.olingo.server.api.uri.queryoption.FormatOption;
-
-/**
- * Used for URI info kind {@link UriInfoKind#metadata} to describe URIs like
- * http://.../serviceroot/$metadata...
- */
-public interface UriInfoMetadata {
-
- /**
- * @return Object containing information of the $id option
- */
- public FormatOption getFormatOption();
-
- /**
- * @return Object containing information of the URI fragment
- */
- public String getFragment();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java
deleted file mode 100644
index 7a62c36..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.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.server.api.uri;
-
-import org.apache.olingo.server.api.uri.queryoption.CountOption;
-import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption;
-import org.apache.olingo.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.server.api.uri.queryoption.FilterOption;
-import org.apache.olingo.server.api.uri.queryoption.FormatOption;
-import org.apache.olingo.server.api.uri.queryoption.IdOption;
-import org.apache.olingo.server.api.uri.queryoption.OrderByOption;
-import org.apache.olingo.server.api.uri.queryoption.SearchOption;
-import org.apache.olingo.server.api.uri.queryoption.SelectOption;
-import org.apache.olingo.server.api.uri.queryoption.SkipOption;
-import org.apache.olingo.server.api.uri.queryoption.SkipTokenOption;
-import org.apache.olingo.server.api.uri.queryoption.TopOption;
-
-import java.util.List;
-
-/**
- * Used for URI info kind {@link UriInfoKind#resource} to describe URIs like
- * E.g. http://.../serviceroot/entitySet
- */
-public interface UriInfoResource {
-
- /**
- * @return List of custom query options used in the URI
- */
- List<CustomQueryOption> getCustomQueryOptions();
-
- /**
- * @return Object containing information of the $expand option
- */
- ExpandOption getExpandOption();
-
- /**
- * @return Object containing information of the $filter option
- */
- FilterOption getFilterOption();
-
- /**
- * @return Object containing information of the $format option
- */
- FormatOption getFormatOption();
-
- /**
- * @return Object containing information of the $id option
- */
- IdOption getIdOption();
-
- /**
- * @return Object containing information of the $count option
- */
- CountOption getCountOption();
-
- /**
- * @return Object containing information of the $orderby option
- */
- OrderByOption getOrderByOption();
-
- /**
- * @return Object containing information of the $search option
- */
- SearchOption getSearchOption();
-
- /**
- * @return Object containing information of the $select option
- */
- SelectOption getSelectOption();
-
- /**
- * @return Object containing information of the $skip option
- */
- SkipOption getSkipOption();
-
- /**
- * @return Object containing information of the $skiptoken option
- */
- SkipTokenOption getSkipTokenOption();
-
- /**
- * @return Object containing information of the $top option
- */
- TopOption getTopOption();
-
- /**
- * The path segments behind the service root define which resources are
- * requested by that URI. This may be entities/functions/actions and more.
- * Each segments information (name, key predicates, function parameters, ...) is
- * stored within an resource object dedicated for that segment type.</p>
- * For example: the URI http://.../serviceroot/entitySet(1)/Adresse will
- * have 2 ResourceParts:<br>
- * - The first one of type {@link UriResourceEntitySet} containing the name of the entity set and also the key
- * predicate information.<br>
- * - The second one of type {@link UriResourceComplexProperty} containing the name of
- * the accessed complex property
- *
- * @return List of resource parts.
- */
- List<UriResource> getUriResourceParts();
-
- /**
- * @param alias
- * @return the value for the given alias or null if no value is defined
- */
- String getValueForAlias(String alias);
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
deleted file mode 100644
index 137a986..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoService.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-/**
- * Used for URI info kind {@link UriInfoKind#service} to describe URIs like
- * http://.../serviceroot
- */
-public interface UriInfoService {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
deleted file mode 100644
index 9f3d45f..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
-
-/**
- * Represents an function parameter or key predicate when used in the URI.
- */
-public interface UriParameter {
-
- /**
- * @return Alias name if the parameters values is an alias, otherwise null
- */
- public String getAlias();
-
- /**
- * @return Text of the parameters value
- */
- public String getText();
-
- /**
- * @return If the parameters value is a expression and expression is returned, otherwise null
- */
- public Expression getExpression();
-
- /**
- * @return Name of the parameter
- */
- public String getName();
-
- /**
- * @return Name of the referenced property when referential constrains are used
- */
- public String getReferencedProperty();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
deleted file mode 100644
index 468b15c..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResource.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-/**
- * Super interface for all objects representing resource parts.
- * See {@link UriInfoResource} for details.
- */
-public interface UriResource {
-
- /**
- * @return Kind of the resource part
- */
- UriResourceKind getKind();
-
- @Override
- String toString();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
deleted file mode 100644
index 3ba7ce7..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceAction.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-import org.apache.olingo.commons.api.edm.EdmAction;
-import org.apache.olingo.commons.api.edm.EdmActionImport;
-
-/**
- * Used to describe an action used within an resource path
- * For example: http://.../serviceroot/action()
- */
-public interface UriResourceAction extends UriResourcePartTyped {
-
- /**
- * @return Action used in the resource path
- */
- EdmAction getAction();
-
- /**
- * Convenience method which returns the {@link EdmActionImport} which was used in
- * the resource path to define the {@link EdmAction}.
- * @return Action Import used in the resource path
- */
- EdmActionImport getActionImport();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
deleted file mode 100644
index 5a1f0ae..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceComplexProperty.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-import org.apache.olingo.commons.api.edm.EdmComplexType;
-
-/**
- * Used to describe an complex property used within an resource path
- * E.g. http://.../serviceroot/entityset(1)/complexproperty
- */
-public interface UriResourceComplexProperty extends UriResourceProperty {
-
- /**
- * @return Complex property used in the resource path
- */
- EdmComplexType getComplexType();
-
- /**
- * Behind a complex property may be a type filter
- * E.g. http://.../serviceroot/entityset(1)/complexproperty/namespace.complextype
- * @return Type filter if found, otherwise null
- */
- EdmComplexType getComplexTypeFilter();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
deleted file mode 100644
index ba77d2c..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceCount.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.server.api.uri;
-
-/**
- * Used to describe an $count used within an resource path
- * For example: http://.../serviceroot/entityset(1)/$count
- */
-public interface UriResourceCount extends UriResource {
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
deleted file mode 100644
index d7f35fb..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java
+++ /dev/null
@@ -1,58 +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.server.api.uri;
-
-import org.apache.olingo.commons.api.edm.EdmEntitySet;
-import org.apache.olingo.commons.api.edm.EdmEntityType;
-import org.apache.olingo.commons.api.edm.EdmType;
-
-import java.util.List;
-
-/**
- * Used to describe an entity set used within an resource path
- * For example: http://.../serviceroot/entityset(1)
- */
-public interface UriResourceEntitySet extends UriResourcePartTyped {
-
- /**
- * @return Entity set used in the resource path
- */
- EdmEntitySet getEntitySet();
-
- /**
- * @return Type of the entity set
- */
- EdmEntityType getEntityType();
-
- /**
- * @return Key predicates if used, otherwise null
- */
- List<UriParameter> getKeyPredicates();
-
- /**
- * @return Type filter before key predicates if used, otherwise null
- */
- EdmType getTypeFilterOnCollection();
-
- /**
- * @return Type filter behind key predicates if used, otherwise null
- */
- EdmType getTypeFilterOnEntry();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java
deleted file mode 100644
index 00db971..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.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.server.api.uri;
-
-import org.apache.olingo.commons.api.edm.EdmFunction;
-import org.apache.olingo.commons.api.edm.EdmFunctionImport;
-import org.apache.olingo.commons.api.edm.EdmType;
-
-import java.util.List;
-
-/**
- * Used to describe an function import or bound function used within an resource path
- * For example: http://.../serviceroot/functionImport(P1=1,P2='A')
- */
-public interface UriResourceFunction extends UriResourcePartTyped {
-
- /**
- * @return Function used in the resource path
- */
- EdmFunction getFunction();
-
- /**
- * Convenience method which returns the {@link EdmFunctionImport} which was used in
- * the resource path to define the {@link EdmFunction}.
- * @return Function Import used in the resource path
- */
- EdmFunctionImport getFunctionImport();
-
- /**
- * @return Key predicates if used, otherwise null
- */
- List<UriParameter> getKeyPredicates();
-
- /**
- * @return List of function parameters
- */
- List<UriParameter> getParameters();
-
- /**
- * @return Type filter before key predicates if used, otherwise null
- */
- EdmType getTypeFilterOnCollection();
-
- /**
- * @return Type filter behind key predicates if used, otherwise null
- */
- EdmType getTypeFilterOnEntry();
-
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
deleted file mode 100644
index c61ce19..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceIt.java
+++ /dev/null
@@ -1,38 +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.server.api.uri;
-
-import org.apache.olingo.commons.api.edm.EdmType;
-
-/**
- * Class indicating the $it reference. $it may be used within expression to
- * refer to the last EDM object referenced in the resource path.
- */
-public interface UriResourceIt extends UriResourcePartTyped {
-
- /**
- * @return Type filter if $it refers to a collection
- */
- EdmType getTypeFilterOnCollection();
-
- /**
- * @return Type filter if $it refers to a single entry
- */
- EdmType getTypeFilterOnEntry();
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
deleted file mode 100644
index 9e65dc1..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceKind.java
+++ /dev/null
@@ -1,115 +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.server.api.uri;
-
-/**
- * Defining the various resource part types
- */
-public enum UriResourceKind {
-
- /**
- * Class: {@link UriResourceAction}<br>
- * URI: http://.../serviceroot/action()
- */
- action,
-
- /**
- * Class: {@link UriResourceComplexProperty}<br>
- * URI: http://.../serviceroot/entityset(1)/complexproperty()
- */
- complexProperty,
-
- /**
- * Class: {@link UriResourceCount}<br>
- * URI: http://.../serviceroot/entityset/$count
- */
- count,
-
- /**
- * Class: {@link UriResourceEntitySet}<br>
- * URI: http://.../serviceroot/entityset
- */
- entitySet,
-
- /**
- * Class: {@link UriResourceFunction}<br>
- * URI: http://.../serviceroot/functionimport(P1=1,P2='a')
- */
- function,
-
- /**
- * Class: {@link UriResourceIt}<br>
- * URI: http://.../serviceroot/entityset?$filter=$it/property
- */
- it,
-
- /**
- * Class: {@link UriResourceLambdaAll}<br>
- * URI: http://.../serviceroot/entityset/all(...)
- */
- lambdaAll,
-
- /**
- * Class: {@link UriResourceLambdaAny}<br>
- * URI: http://.../serviceroot/entityset/any(...)
- */
- lambdaAny,
-
- /**
- * Class: {@link UriResourceLambdaVariable}<br>
- * URI: http://.../serviceroot/entityset/listofstring/any(d: 'string' eq d)
- */
- lambdaVariable,
-
- /**
- * Class: {@link UriResourceNavigation}<br>
- * URI: http://.../serviceroot/entityset(1)/navProperty
- */
- navigationProperty,
-
- /**
- * Class: {@link UriResourceRef}<br>
- * URI: http://.../serviceroot/entityset/$ref
- */
- ref,
-
- /**
- * Class: {@link UriResourceRoot}<br>
- * URI: http://.../serviceroot/entityset(1)?$filter=property eq $root/singleton/configstring
- */
- root,
-
- /**
- * Class: {@link UriResourceProperty}<br>
- * URI: http://.../serviceroot/entityset(1)/property
- */
- primitiveProperty,
-
- /**
- * Class: {@link UriResourceSingleton}<br>
- * URI: http://.../serviceroot/singleton
- */
- singleton,
-
- /**
- * Class: {@link UriResourceValue}<br>
- * URI: http://.../serviceroot/entityset(1)/property/$value
- */
- value,
-}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/f7a7b484/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java
deleted file mode 100644
index 328d59b..0000000
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.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.server.api.uri;
-
-import org.apache.olingo.server.api.uri.queryoption.expression.Expression;
-
-/**
- * Used to describe an all lambda expression used within an resource path
- * For example: http://.../serviceroot/entityset/all(...)
- */
-public interface UriResourceLambdaAll extends UriResourcePartTyped {
-
- /**
- * @return Name of the lambda variable
- */
- public String getLambdaVariable();
-
- /**
- * @return Lambda expression
- */
- public Expression getExpression();
-
-}