[OLINGO-841] CleanUp Server API
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/d4902f72 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/d4902f72 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/d4902f72 Branch: refs/heads/master Commit: d4902f725b2430aa43aeb516896e38c8c722111a Parents: d1055fd Author: Christian Amend <[email protected]> Authored: Fri Dec 18 13:42:53 2015 +0100 Committer: Christian Amend <[email protected]> Committed: Fri Dec 18 13:42:53 2015 +0100 ---------------------------------------------------------------------- .../apache/olingo/server/api/HttpHeaders.java | 4 +- .../org/apache/olingo/server/api/OData.java | 6 +- .../server/api/ODataApplicationException.java | 4 +- .../olingo/server/api/ODataHttpHandler.java | 4 +- .../server/api/ODataLibraryException.java | 4 +- .../apache/olingo/server/api/ODataRequest.java | 6 +- .../apache/olingo/server/api/ODataResponse.java | 5 +- .../olingo/server/api/ODataServerError.java | 4 +- .../olingo/server/api/ServiceMetadata.java | 4 +- .../olingo/server/api/batch/BatchFacade.java | 106 +++++++++---------- .../olingo/server/api/batch/package-info.java | 4 +- .../server/api/debug/DebugInformation.java | 16 +-- .../server/api/debug/DebugResponseHelper.java | 4 +- .../olingo/server/api/debug/DebugSupport.java | 9 +- .../server/api/debug/DefaultDebugSupport.java | 8 +- .../server/api/debug/RuntimeMeasurement.java | 12 +-- .../olingo/server/api/debug/package-info.java | 4 +- .../api/deserializer/DeserializerException.java | 4 +- .../api/deserializer/DeserializerResult.java | 4 +- .../deserializer/FixedFormatDeserializer.java | 12 +-- .../api/deserializer/ODataDeserializer.java | 10 +- .../batch/BatchDeserializerException.java | 14 +-- .../api/deserializer/batch/BatchOptions.java | 8 +- .../deserializer/batch/BatchRequestPart.java | 4 +- .../deserializer/batch/ODataResponsePart.java | 8 +- .../api/deserializer/batch/package-info.java | 4 +- .../server/api/deserializer/package-info.java | 4 +- .../server/api/etag/CustomETagSupport.java | 4 +- .../olingo/server/api/etag/ETagHelper.java | 22 ++-- .../server/api/etag/PreconditionException.java | 4 +- .../api/etag/ServiceMetadataETagSupport.java | 6 +- .../olingo/server/api/etag/package-info.java | 4 +- .../apache/olingo/server/api/package-info.java | 4 +- .../olingo/server/api/prefer/Preferences.java | 13 ++- .../server/api/prefer/PreferencesApplied.java | 16 +-- .../olingo/server/api/prefer/package-info.java | 4 +- .../ActionComplexCollectionProcessor.java | 4 +- .../api/processor/ActionComplexProcessor.java | 4 +- .../ActionEntityCollectionProcessor.java | 4 +- .../api/processor/ActionEntityProcessor.java | 4 +- .../ActionPrimitiveCollectionProcessor.java | 4 +- .../api/processor/ActionPrimitiveProcessor.java | 4 +- .../api/processor/ActionVoidProcessor.java | 4 +- .../server/api/processor/BatchProcessor.java | 4 +- .../processor/ComplexCollectionProcessor.java | 4 +- .../server/api/processor/ComplexProcessor.java | 4 +- .../CountComplexCollectionProcessor.java | 4 +- .../CountEntityCollectionProcessor.java | 4 +- .../CountPrimitiveCollectionProcessor.java | 4 +- .../server/api/processor/DefaultProcessor.java | 4 +- .../server/api/processor/DeltaProcessor.java | 30 +++--- .../processor/EntityCollectionProcessor.java | 4 +- .../server/api/processor/EntityProcessor.java | 6 +- .../server/api/processor/ErrorProcessor.java | 6 +- .../api/processor/MediaEntityProcessor.java | 4 +- .../server/api/processor/MetadataProcessor.java | 4 +- .../processor/PrimitiveCollectionProcessor.java | 4 +- .../api/processor/PrimitiveProcessor.java | 6 +- .../api/processor/PrimitiveValueProcessor.java | 6 +- .../olingo/server/api/processor/Processor.java | 4 +- .../processor/ReferenceCollectionProcessor.java | 4 +- .../api/processor/ReferenceProcessor.java | 4 +- .../api/processor/ServiceDocumentProcessor.java | 4 +- .../server/api/processor/package-info.java | 5 +- .../serializer/BatchSerializerException.java | 7 +- .../serializer/ComplexSerializerOptions.java | 10 +- .../serializer/CustomContentTypeSupport.java | 4 +- .../EntityCollectionSerializerOptions.java | 8 +- .../api/serializer/EntitySerializerOptions.java | 8 +- .../api/serializer/FixedFormatSerializer.java | 6 +- .../server/api/serializer/ODataSerializer.java | 52 ++++----- .../serializer/PrimitiveSerializerOptions.java | 10 +- .../PrimitiveValueSerializerOptions.java | 4 +- .../ReferenceCollectionSerializerOptions.java | 12 +-- .../serializer/ReferenceSerializerOptions.java | 4 +- .../api/serializer/RepresentationType.java | 4 +- .../api/serializer/SerializerException.java | 4 +- .../server/api/serializer/SerializerResult.java | 4 +- .../server/api/serializer/package-info.java | 4 +- .../apache/olingo/server/api/uri/UriHelper.java | 10 +- .../apache/olingo/server/api/uri/UriInfo.java | 6 +- .../olingo/server/api/uri/UriInfoAll.java | 6 +- .../olingo/server/api/uri/UriInfoBatch.java | 6 +- .../olingo/server/api/uri/UriInfoCrossjoin.java | 8 +- .../olingo/server/api/uri/UriInfoEntityId.java | 4 +- .../olingo/server/api/uri/UriInfoKind.java | 4 +- .../olingo/server/api/uri/UriInfoMetadata.java | 4 +- .../olingo/server/api/uri/UriInfoResource.java | 4 +- .../olingo/server/api/uri/UriInfoService.java | 6 +- .../olingo/server/api/uri/UriParameter.java | 4 +- .../olingo/server/api/uri/UriResource.java | 4 +- .../server/api/uri/UriResourceAction.java | 4 +- .../api/uri/UriResourceComplexProperty.java | 4 +- .../olingo/server/api/uri/UriResourceCount.java | 6 +- .../server/api/uri/UriResourceEntitySet.java | 4 +- .../server/api/uri/UriResourceFunction.java | 4 +- .../olingo/server/api/uri/UriResourceIt.java | 4 +- .../olingo/server/api/uri/UriResourceKind.java | 4 +- .../server/api/uri/UriResourceLambdaAll.java | 4 +- .../server/api/uri/UriResourceLambdaAny.java | 4 +- .../api/uri/UriResourceLambdaVariable.java | 4 +- .../server/api/uri/UriResourceNavigation.java | 4 +- .../server/api/uri/UriResourcePartTyped.java | 6 +- .../api/uri/UriResourcePrimitiveProperty.java | 6 +- .../server/api/uri/UriResourceProperty.java | 4 +- .../olingo/server/api/uri/UriResourceRef.java | 6 +- .../olingo/server/api/uri/UriResourceRoot.java | 6 +- .../server/api/uri/UriResourceSingleton.java | 4 +- .../olingo/server/api/uri/UriResourceValue.java | 6 +- .../olingo/server/api/uri/package-info.java | 6 +- .../api/uri/queryoption/AliasQueryOption.java | 4 +- .../server/api/uri/queryoption/CountOption.java | 4 +- .../api/uri/queryoption/CustomQueryOption.java | 6 +- .../server/api/uri/queryoption/ExpandItem.java | 4 +- .../api/uri/queryoption/ExpandOption.java | 4 +- .../api/uri/queryoption/FilterOption.java | 4 +- .../api/uri/queryoption/FormatOption.java | 4 +- .../server/api/uri/queryoption/IdOption.java | 4 +- .../api/uri/queryoption/LevelsExpandOption.java | 4 +- .../server/api/uri/queryoption/OrderByItem.java | 4 +- .../api/uri/queryoption/OrderByOption.java | 4 +- .../server/api/uri/queryoption/QueryOption.java | 4 +- .../api/uri/queryoption/SearchOption.java | 4 +- .../server/api/uri/queryoption/SelectItem.java | 4 +- .../api/uri/queryoption/SelectOption.java | 4 +- .../server/api/uri/queryoption/SkipOption.java | 4 +- .../api/uri/queryoption/SkipTokenOption.java | 4 +- .../api/uri/queryoption/SystemQueryOption.java | 4 +- .../uri/queryoption/SystemQueryOptionKind.java | 4 +- .../server/api/uri/queryoption/TopOption.java | 4 +- .../api/uri/queryoption/expression/Alias.java | 4 +- .../api/uri/queryoption/expression/Binary.java | 4 +- .../expression/BinaryOperatorKind.java | 4 +- .../uri/queryoption/expression/Enumeration.java | 4 +- .../uri/queryoption/expression/Expression.java | 6 +- .../expression/ExpressionVisitException.java | 4 +- .../expression/ExpressionVisitor.java | 4 +- .../uri/queryoption/expression/LambdaRef.java | 4 +- .../api/uri/queryoption/expression/Literal.java | 10 +- .../api/uri/queryoption/expression/Member.java | 4 +- .../api/uri/queryoption/expression/Method.java | 4 +- .../uri/queryoption/expression/MethodKind.java | 4 +- .../uri/queryoption/expression/TypeLiteral.java | 4 +- .../api/uri/queryoption/expression/Unary.java | 4 +- .../expression/UnaryOperatorKind.java | 4 +- .../expression/VisitableExpression.java | 4 +- .../queryoption/expression/package-info.java | 4 +- .../api/uri/queryoption/package-info.java | 4 +- .../uri/queryoption/search/SearchBinary.java | 4 +- .../search/SearchBinaryOperatorKind.java | 4 +- .../queryoption/search/SearchExpression.java | 18 ++-- .../api/uri/queryoption/search/SearchTerm.java | 4 +- .../api/uri/queryoption/search/SearchUnary.java | 5 +- .../search/SearchUnaryOperatorKind.java | 4 +- .../uri/queryoption/search/package-info.java | 4 +- .../olingo/server/api/ODataRequestTest.java | 4 +- .../server/api/TranslatedExceptionsTest.java | 4 +- .../api/prefer/PreferencesAppliedTest.java | 22 ++-- 158 files changed, 517 insertions(+), 515 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/HttpHeaders.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/HttpHeaders.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/HttpHeaders.java index cc0fd33..ff82dc0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/HttpHeaders.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/HttpHeaders.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java index 75b2e27..8e90c57 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/OData.java @@ -6,9 +6,9 @@ * 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 @@ -21,10 +21,10 @@ package org.apache.olingo.server.api; import java.util.Collection; import java.util.List; -import org.apache.olingo.commons.api.ex.ODataRuntimeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.provider.CsdlEdmProvider; +import org.apache.olingo.commons.api.ex.ODataRuntimeException; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.server.api.debug.DebugResponseHelper; import org.apache.olingo.server.api.deserializer.DeserializerException; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java index 3e92820..7105dce 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataApplicationException.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java index a2180c8..26d14c3 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java index f7f5dee..6c9fe05 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataLibraryException.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java index 21122b8..bab04a1 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java @@ -6,9 +6,9 @@ * 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 @@ -226,7 +226,7 @@ public class ODataRequest { * @param protocol * @see #getProtocol() */ - public void setProtocol(String protocol) { + public void setProtocol(final String protocol) { this.protocol = protocol; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java index 3b63af7..3644295 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataResponse.java @@ -6,9 +6,9 @@ * 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 @@ -115,7 +115,6 @@ public class ODataResponse { return values == null || values.isEmpty() ? null : values.get(0); } - /** * Sets the content (body). * @param content the content as {@link InputStream} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataServerError.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataServerError.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataServerError.java index b9c6dcb..0e6c72c 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataServerError.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataServerError.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java index 91c782a..7840115 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ServiceMetadata.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java index 72625de..3794b4d 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java @@ -6,9 +6,9 @@ * 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 @@ -17,57 +17,57 @@ * under the License. */package org.apache.olingo.server.api.batch; -import org.apache.olingo.server.api.ODataApplicationException; -import org.apache.olingo.server.api.ODataLibraryException; -import org.apache.olingo.server.api.ODataRequest; -import org.apache.olingo.server.api.ODataResponse; -import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart; -import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart; + import org.apache.olingo.server.api.ODataApplicationException; + import org.apache.olingo.server.api.ODataLibraryException; + import org.apache.olingo.server.api.ODataRequest; + import org.apache.olingo.server.api.ODataResponse; + import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart; + import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart; -/** - * <p>Provides methods to process {@link ODataRequest}s and {@link BatchRequestPart}s - * in the context of a batch request.</p> - * - * <p>Within a {@link org.apache.olingo.server.api.processor.BatchProcessor BatchProcessor} - * implementation BatchRequestParts should be passed to {@link #handleBatchRequest(BatchRequestPart)}. - * Only if the BatchRequestPart represents a change set, the request will be delegated to - * {@link org.apache.olingo.server.api.processor.BatchProcessor#processChangeSet(BatchFacade, java.util.List)}. - * Otherwise the requests will be directly executed.</p> - * - * <p>The processor implementation could use {@link #handleODataRequest(ODataRequest)} to process - * requests in a change set.</p> - */ -public interface BatchFacade { - /** - * Executes an ODataRequest, which must be a part of a change set. - * Each request must have a Content-Id header field, which holds an identifier - * that is unique in the whole batch request. - * @param request ODataRequest to process - * @return corresponding ODataResponse to the given request - * @throws ODataApplicationException - * @throws ODataLibraryException - */ - public ODataResponse handleODataRequest(ODataRequest request) - throws ODataApplicationException, ODataLibraryException; + /** + * <p>Provides methods to process {@link ODataRequest}s and {@link BatchRequestPart}s + * in the context of a batch request.</p> + * + * <p>Within a {@link org.apache.olingo.server.api.processor.BatchProcessor BatchProcessor} implementation + * BatchRequestParts should be passed to {@link #handleBatchRequest(BatchRequestPart)}. + * Only if the BatchRequestPart represents a change set, the request will be delegated to + * {@link org.apache.olingo.server.api.processor.BatchProcessor#processChangeSet(BatchFacade, java.util.List)}. + * Otherwise the requests will be directly executed.</p> + * + * <p>The processor implementation could use {@link #handleODataRequest(ODataRequest)} to process + * requests in a change set.</p> + */ + public interface BatchFacade { + /** + * Executes an ODataRequest, which must be a part of a change set. + * Each request must have a Content-Id header field, which holds an identifier + * that is unique in the whole batch request. + * @param request ODataRequest to process + * @return corresponding ODataResponse to the given request + * @throws ODataApplicationException + * @throws ODataLibraryException + */ + public ODataResponse handleODataRequest(ODataRequest request) + throws ODataApplicationException, ODataLibraryException; - /** - * Handles a BatchRequestPart. - * @param request Request to process - * @return corresponding {@link ODataResponsePart} - * @throws ODataApplicationException - * @throws ODataLibraryException - */ - public ODataResponsePart handleBatchRequest(BatchRequestPart request) - throws ODataApplicationException, ODataLibraryException; + /** + * Handles a BatchRequestPart. + * @param request Request to process + * @return corresponding {@link ODataResponsePart} + * @throws ODataApplicationException + * @throws ODataLibraryException + */ + public ODataResponsePart handleBatchRequest(BatchRequestPart request) + throws ODataApplicationException, ODataLibraryException; - /** - * Extracts the boundary of a multipart/mixed header. - * See RFC 2046#5.1 - * @param contentType Content Type - * @return boundary - * @throws ODataApplicationException - * @throws ODataLibraryException - */ - public String extractBoundaryFromContentType(String contentType) - throws ODataApplicationException, ODataLibraryException; -} + /** + * Extracts the boundary of a multipart/mixed header. + * See RFC 2046#5.1 + * @param contentType Content Type + * @return boundary + * @throws ODataApplicationException + * @throws ODataLibraryException + */ + public String extractBoundaryFromContentType(String contentType) + throws ODataApplicationException, ODataLibraryException; + } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/package-info.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/package-info.java index a6952ad..5906051 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/package-info.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java index 2f4e67d..e91a0dd 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugInformation.java @@ -6,9 +6,9 @@ * 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 @@ -46,7 +46,7 @@ public class DebugInformation { return request; } - public void setRequest(ODataRequest request) { + public void setRequest(final ODataRequest request) { this.request = request; } @@ -59,7 +59,7 @@ public class DebugInformation { return applicationResponse; } - public void setApplicationResponse(ODataResponse applicationResponse) { + public void setApplicationResponse(final ODataResponse applicationResponse) { this.applicationResponse = applicationResponse; } @@ -72,7 +72,7 @@ public class DebugInformation { return uriInfo; } - public void setUriInfo(UriInfo uriInfo) { + public void setUriInfo(final UriInfo uriInfo) { this.uriInfo = uriInfo; } @@ -85,7 +85,7 @@ public class DebugInformation { return exception; } - public void setException(Exception exception) { + public void setException(final Exception exception) { this.exception = exception; } @@ -98,7 +98,7 @@ public class DebugInformation { return serverEnvironmentVariables; } - public void setServerEnvironmentVariables(Map<String, String> serverEnvironmentVariables) { + public void setServerEnvironmentVariables(final Map<String, String> serverEnvironmentVariables) { this.serverEnvironmentVariables = serverEnvironmentVariables; } @@ -111,7 +111,7 @@ public class DebugInformation { return runtimeInformation; } - public void setRuntimeInformation(List<RuntimeMeasurement> runtimeInformation) { + public void setRuntimeInformation(final List<RuntimeMeasurement> runtimeInformation) { this.runtimeInformation = runtimeInformation; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugResponseHelper.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugResponseHelper.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugResponseHelper.java index ec6a2c4..02845be 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugResponseHelper.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugResponseHelper.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java index 34527b9..8a62427 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DebugSupport.java @@ -6,9 +6,9 @@ * 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 @@ -33,8 +33,7 @@ public interface DebugSupport { /** * Initializes the debug support implementation. - * Is called before {@link #isUserAuthorized()} and - * {@link #createDebugResponse(String, DebugInformation)}. + * Is called before {@link #isUserAuthorized()} and {@link #createDebugResponse(String, DebugInformation)}. * @param odata */ void init(OData odata); @@ -49,7 +48,7 @@ public interface DebugSupport { * Creates a debug response and delivers it back to the Olingo library. * This method MUST NEVER throw an exception. * @param debugFormat the value of the odata-debug query parameter - * @param debugInfo all necessary information to construct debug output + * @param debugInfo all necessary information to construct debug output * @return a new debug response which will be sent to the client */ ODataResponse createDebugResponse(String debugFormat, DebugInformation debugInfo); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DefaultDebugSupport.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DefaultDebugSupport.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DefaultDebugSupport.java index 7079e76..b8c86f6 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DefaultDebugSupport.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/DefaultDebugSupport.java @@ -6,9 +6,9 @@ * 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 @@ -29,7 +29,7 @@ public class DefaultDebugSupport implements DebugSupport { private OData odata; @Override - public void init(OData odata) { + public void init(final OData odata) { this.odata = odata; } @@ -39,7 +39,7 @@ public class DefaultDebugSupport implements DebugSupport { } @Override - public ODataResponse createDebugResponse(String debugFormat, DebugInformation debugInfo) { + public ODataResponse createDebugResponse(final String debugFormat, final DebugInformation debugInfo) { // Check if debugFormat is supported by the library if (DebugSupport.ODATA_DEBUG_JSON.equalsIgnoreCase(debugFormat) || DebugSupport.ODATA_DEBUG_HTML.equalsIgnoreCase(debugFormat) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/RuntimeMeasurement.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/RuntimeMeasurement.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/RuntimeMeasurement.java index 69e30da..bdf10fb 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/RuntimeMeasurement.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/RuntimeMeasurement.java @@ -6,9 +6,9 @@ * 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 @@ -35,7 +35,7 @@ public class RuntimeMeasurement { * Sets the class name. * @param className the name of the class that is measured */ - public void setClassName(String className) { + public void setClassName(final String className) { this.className = className; } @@ -51,7 +51,7 @@ public class RuntimeMeasurement { * Sets the method name. * @param methodName the name of the method that is measured */ - public void setMethodName(String methodName) { + public void setMethodName(final String methodName) { this.methodName = methodName; } @@ -68,7 +68,7 @@ public class RuntimeMeasurement { * @param timeStarted the start time in nanoseconds * @see System#nanoTime() */ - public void setTimeStarted(long timeStarted) { + public void setTimeStarted(final long timeStarted) { this.timeStarted = timeStarted; } @@ -86,7 +86,7 @@ public class RuntimeMeasurement { * @param timeStopped the stop time in nanoseconds * @see System#nanoTime() */ - public void setTimeStopped(long timeStopped) { + public void setTimeStopped(final long timeStopped) { this.timeStopped = timeStopped; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/package-info.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/package-info.java index 91c95e6..9936711 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/package-info.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/debug/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerException.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerException.java index 56567f2..2ce55aa 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerException.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerException.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java index c096118..e9f035c 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/DeserializerResult.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/FixedFormatDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/FixedFormatDeserializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/FixedFormatDeserializer.java index 0bf8e0d..4828668 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/FixedFormatDeserializer.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/FixedFormatDeserializer.java @@ -6,9 +6,9 @@ * 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 @@ -39,23 +39,23 @@ public interface FixedFormatDeserializer { /** * Reads primitive-type data from an InputStream. - * @param content the textual value as input stream + * @param content the textual value as input stream * @param property EDM property */ public Object primitiveValue(InputStream content, EdmProperty property) throws DeserializerException; /** * Reads parameter data (in URI syntax) from a String. - * @param content the textual value as String + * @param content the textual value as String * @param parameter EDM parameter */ public Parameter parameter(String content, EdmParameter parameter) throws DeserializerException; /** * Reads batch data from an InputStream. - * @param content the data as multipart input stream + * @param content the data as multipart input stream * @param boundary the boundary between the parts - * @param options options for the deserializer + * @param options options for the deserializer * @return a list of batch-request parts */ public List<BatchRequestPart> parseBatchRequest(InputStream content, String boundary, BatchOptions options) http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java index ac40352..cc09e7d 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/ODataDeserializer.java @@ -6,9 +6,9 @@ * 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 @@ -32,7 +32,7 @@ public interface ODataDeserializer { /** * Deserializes an entity stream into an {@link org.apache.olingo.commons.api.data.Entity Entity} object. * Validates: property types, no double properties, correct json types. - * Returns a deserialized {@link org.apache.olingo.commons.api.data.Entity Entity} object and an + * Returns a deserialized {@link org.apache.olingo.commons.api.data.Entity Entity} object and an * {@link org.apache.olingo.server.api.uri.queryoption.ExpandOption ExpandOption} object. * @param stream * @param edmEntityType @@ -42,8 +42,8 @@ public interface ODataDeserializer { DeserializerResult entity(InputStream stream, EdmEntityType edmEntityType) throws DeserializerException; /** - * Deserializes an entity collection stream into an - * {@link org.apache.olingo.commons.api.data.EntityCollection EntityCollection} object. + * Deserializes an entity collection stream into an {@link org.apache.olingo.commons.api.data.EntityCollection + * EntityCollection} object. * @param stream * @param edmEntityType * @return {@link DeserializerResult#getEntityCollection()} http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchDeserializerException.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchDeserializerException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchDeserializerException.java index e7a81da..6420ba6 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchDeserializerException.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchDeserializerException.java @@ -6,9 +6,9 @@ * 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 @@ -76,8 +76,8 @@ public class BatchDeserializerException extends DeserializerException { /** * Creates batch deserializer 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 + * @param messageKey one of the {@link MessageKeys} for the exception text in the resource bundle + * @param parameters parameters for the exception text */ public BatchDeserializerException(final String developmentMessage, final MessageKey messageKey, final String... parameters) { @@ -87,9 +87,9 @@ public class BatchDeserializerException extends DeserializerException { /** * Creates batch deserializer 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 + * @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 BatchDeserializerException(final String developmentMessage, final Throwable cause, final MessageKey messageKey, final String... parameters) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java index b0f929a..52ef213 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java @@ -6,9 +6,9 @@ * 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 @@ -20,8 +20,8 @@ package org.apache.olingo.server.api.deserializer.batch; /** * Options for the batch deserializer. - * @see org.apache.olingo.server.api.deserializer.FixedFormatDeserializer - * #parseBatchRequest(java.io.InputStream, String, BatchOptions) + * @see org.apache.olingo.server.api.deserializer.FixedFormatDeserializer #parseBatchRequest(java.io.InputStream, + * String, BatchOptions) */ public final class BatchOptions { private boolean isStrict = true; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java index 5802c9e..225bacf 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchRequestPart.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java index 8b0bd52..aff6874 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/ODataResponsePart.java @@ -6,9 +6,9 @@ * 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 @@ -38,7 +38,7 @@ public class ODataResponsePart { * An ODataResponsePart represents a collection of ODataResponses. * A list of ODataResponseParts can be combined by the BatchSerializer to a single * OData batch response. - * + * * @param responses A list of {@link ODataResponse} * @param isChangeSet whether this ODataResponsePart represents a change set */ @@ -53,7 +53,7 @@ public class ODataResponsePart { * An ODataResponsePart represents a collection of ODataResponses. * A list of ODataResponseParts can be combined by the BatchSerializer to a single * OData batch response. - * + * * @param response A single {@link ODataResponse} * @param isChangeSet whether this ODataResponsePart represents a change set */ http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/package-info.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/package-info.java index 41554cb..8f951a4 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/package-info.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/package-info.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/package-info.java index 499d684..9c7839b 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/package-info.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/CustomETagSupport.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/CustomETagSupport.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/CustomETagSupport.java index 8194b96..873db13 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/CustomETagSupport.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/CustomETagSupport.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ETagHelper.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ETagHelper.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ETagHelper.java index b47c6aa..bbc0bd9 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ETagHelper.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ETagHelper.java @@ -6,9 +6,9 @@ * 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 @@ -26,7 +26,7 @@ import java.util.Collection; public interface ETagHelper { /** * <p>Checks the preconditions of a read request with a given ETag value - * against the If-Match and If-None-Match HTTP headers.</p> + * against the If-Match and If-None-Match HTTP headers.</p> * <p>If the given ETag value is not matched by the ETag information in the If-Match headers, * and there are ETags in the headers to be matched, a "Precondition Failed" exception is * thrown.</p> @@ -37,30 +37,30 @@ public interface ETagHelper { * <a href="https://www.ietf.org/rfc/rfc7232.txt";>RFC 7232</a>, section 2.3.2.</p> * <p>This method does not nothing and returns <code>false</code> if the ETag value is * <code>null</code>.</p> - * @param eTag the ETag value to match - * @param ifMatchHeaders the If-Match header values + * @param eTag the ETag value to match + * @param ifMatchHeaders the If-Match header values * @param ifNoneMatchHeaders the If-None-Match header values * @return whether a "Not Modified" response should be used */ public boolean checkReadPreconditions(String eTag, Collection<String> ifMatchHeaders, Collection<String> ifNoneMatchHeaders) - throws PreconditionException; + throws PreconditionException; /** * <p>Checks the preconditions of a change request (with HTTP methods PUT, PATCH, or DELETE) - * with a given ETag value against the If-Match and If-None-Match HTTP headers.</p> + * with a given ETag value against the If-Match and If-None-Match HTTP headers.</p> * <p>If the given ETag value is not matched by the ETag information in the If-Match headers, * and there are ETags in the headers to be matched, or * if the given ETag value is matched by the ETag information in the If-None-Match headers, - * a "Precondition Failed" exception is thrown.</p> + * a "Precondition Failed" exception is thrown.</p> * <p>All matching uses weak comparison as described in * <a href="https://www.ietf.org/rfc/rfc7232.txt";>RFC 7232</a>, section 2.3.2.</p> * <p>This method does not nothing if the ETag value is <code>null</code>.</p> - * @param eTag the ETag value to match - * @param ifMatchHeaders the If-Match header values + * @param eTag the ETag value to match + * @param ifMatchHeaders the If-Match header values * @param ifNoneMatchHeaders the If-None-Match header values */ public void checkChangePreconditions(String eTag, Collection<String> ifMatchHeaders, Collection<String> ifNoneMatchHeaders) - throws PreconditionException; + throws PreconditionException; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/PreconditionException.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/PreconditionException.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/PreconditionException.java index efa606c..43aabb7 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/PreconditionException.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/PreconditionException.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ServiceMetadataETagSupport.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ServiceMetadataETagSupport.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ServiceMetadataETagSupport.java index 430fce5..6c82b18 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ServiceMetadataETagSupport.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/ServiceMetadataETagSupport.java @@ -6,9 +6,9 @@ * 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 @@ -44,5 +44,5 @@ public interface ServiceMetadataETagSupport { * @return the application generated etag for the service document */ String getServiceDocumentETag(); - + } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/package-info.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/package-info.java index 82ebdc8..fd69dc8 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/package-info.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/etag/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/package-info.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/package-info.java index fcac1f9..98d8ad0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/package-info.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/Preferences.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/Preferences.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/Preferences.java index 2050474..0d0561d 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/Preferences.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/Preferences.java @@ -6,9 +6,9 @@ * 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 @@ -59,7 +59,10 @@ public interface Preferences { /** Whether the preference <code>odata.track-changes</code> has been set. */ public boolean hasTrackChanges(); - public enum Return { REPRESENTATION, MINIMAL } + public enum Return { + REPRESENTATION, MINIMAL + } + /** * Gets the value of the preference <code>return</code> or <code>null</code> if not set * or the value is not valid. @@ -73,7 +76,7 @@ public interface Preferences { * Gets the value of the preference <code>wait</code> or <code>null</code> if not set * or the value is not valid. * @return the number of seconds the client is prepared to wait for the service - * to process the request synchronously + * to process the request synchronously */ public Integer getWait(); @@ -104,7 +107,7 @@ public interface Preferences { public Map<String, String> getParameters() { return parameters == null ? Collections.<String, String> emptyMap() : - Collections.unmodifiableMap(parameters); + Collections.unmodifiableMap(parameters); } } } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/PreferencesApplied.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/PreferencesApplied.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/PreferencesApplied.java index 5aa04c1..ab2b8b6 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/PreferencesApplied.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/PreferencesApplied.java @@ -6,9 +6,9 @@ * 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 @@ -62,16 +62,16 @@ public final class PreferencesApplied { if (entry.getValue() != null) { final boolean safe = isSafe(key); result.append('=') - .append(safe ? "" : '"') - .append(entry.getValue().replaceAll("\\\\|\"", "\\\\$0")) - .append(safe ? "" : '"'); + .append(safe ? "" : '"') + .append(entry.getValue().replaceAll("\\\\|\"", "\\\\$0")) + .append(safe ? "" : '"'); } } return result.toString(); } - private boolean isSafe(String key) { - if(SAFE_PREFERENCE_NAMES.isEmpty()) { + private boolean isSafe(final String key) { + if (SAFE_PREFERENCE_NAMES.isEmpty()) { SAFE_PREFERENCE_NAMES.add(PreferenceName.ALLOW_ENTITY_REFERENCES.getName()); SAFE_PREFERENCE_NAMES.add(PreferenceName.CALLBACK.getName()); SAFE_PREFERENCE_NAMES.add(PreferenceName.CONTINUE_ON_ERROR.getName()); @@ -156,7 +156,7 @@ public final class PreferencesApplied { * The preference name is converted to lowercase. * The value of this preference may be <code>null</code>. * Name and value are not checked for validity. - * @param name preference name + * @param name preference name * @param value preference value */ public Builder preference(final String name, final String value) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/package-info.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/package-info.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/package-info.java index 7d387d5..ba66bd0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/package-info.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/prefer/package-info.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java index 245ccfb..aa7fc27 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexCollectionProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java index 49fd8f2..ccc6cfe 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionComplexProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java index bfa70a0..450d939 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityCollectionProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java index c0b1263..00a61a0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionEntityProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java index 31d5fe7..aa9eb33 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveCollectionProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java index 0905aeb..865cc56 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionPrimitiveProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java index 3d5dae2..f6fd0c0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ActionVoidProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java index cb7f02a..1e8fb96 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java index 97b86d9..d6a0484 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexCollectionProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java index 72acfb3..b43e232 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/ComplexProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java index fb25ab7..192ac84 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountComplexCollectionProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java index a19419d..94acecb 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountEntityCollectionProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java index 0d6ee1a..3781702 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/CountPrimitiveCollectionProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java index 46c7d88..bde6aa4 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java @@ -6,9 +6,9 @@ * 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 http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java index 0be8371..981dd3d 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DeltaProcessor.java @@ -6,9 +6,9 @@ * 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 @@ -23,17 +23,17 @@ package org.apache.olingo.server.api.processor; */ public interface DeltaProcessor extends Processor { - // NOT YET AVAILABLE - // /** - // * Reads delta information from persistence and put it as serialized content and - // * with according 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 ODataLibraryException - // */ - // void readDelta(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat) - // throws ODataApplicationException, ODataLibraryException; + // NOT YET AVAILABLE + // /** + // * Reads delta information from persistence and put it as serialized content and + // * with according 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 ODataLibraryException + // */ + // void readDelta(ODataRequest request, ODataResponse response, UriInfo uriInfo, ContentType responseFormat) + // throws ODataApplicationException, ODataLibraryException; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/d4902f72/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java index 7e0db59..95be3b0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/EntityCollectionProcessor.java @@ -6,9 +6,9 @@ * 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
