You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:33:59 UTC
[37/59] [abbrv] git commit: Cleanup of core
Cleanup of core
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/a030e42b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/a030e42b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/a030e42b
Branch: refs/heads/master
Commit: a030e42bc3c7fa6a9f351e3a99af75eb55d616e2
Parents: cf4caab
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 14:45:03 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 14:45:03 2013 +0200
----------------------------------------------------------------------
.../olingo/odata2/core/ContentNegotiator.java | 100 ++-
.../apache/olingo/odata2/core/Dispatcher.java | 43 +-
.../olingo/odata2/core/ODataContextImpl.java | 29 +-
.../odata2/core/ODataExceptionWrapper.java | 71 +-
.../odata2/core/ODataPathSegmentImpl.java | 26 +-
.../olingo/odata2/core/ODataRequestHandler.java | 143 ++--
.../olingo/odata2/core/ODataRequestImpl.java | 26 +-
.../olingo/odata2/core/ODataResponseImpl.java | 26 +-
.../apache/olingo/odata2/core/PathInfoImpl.java | 26 +-
.../olingo/odata2/core/batch/AcceptParser.java | 38 +-
.../odata2/core/batch/BatchChangeSetImpl.java | 26 +-
.../core/batch/BatchChangeSetPartImpl.java | 26 +-
.../odata2/core/batch/BatchHandlerImpl.java | 56 +-
.../olingo/odata2/core/batch/BatchHelper.java | 26 +-
.../odata2/core/batch/BatchQueryPartImpl.java | 26 +-
.../odata2/core/batch/BatchRequestParser.java | 72 +-
.../odata2/core/batch/BatchRequestPartImpl.java | 26 +-
.../odata2/core/batch/BatchRequestWriter.java | 50 +-
.../odata2/core/batch/BatchResponseParser.java | 78 +-
.../core/batch/BatchResponsePartImpl.java | 26 +-
.../odata2/core/batch/BatchResponseWriter.java | 32 +-
.../core/batch/BatchSingleResponseImpl.java | 26 +-
.../olingo/odata2/core/commons/ContentType.java | 281 +++---
.../olingo/odata2/core/commons/Decoder.java | 38 +-
.../olingo/odata2/core/commons/Encoder.java | 47 +-
.../olingo/odata2/core/debug/DebugInfo.java | 26 +-
.../olingo/odata2/core/debug/DebugInfoBody.java | 29 +-
.../odata2/core/debug/DebugInfoException.java | 35 +-
.../odata2/core/debug/DebugInfoRequest.java | 26 +-
.../odata2/core/debug/DebugInfoResponse.java | 26 +-
.../odata2/core/debug/DebugInfoRuntime.java | 32 +-
.../olingo/odata2/core/debug/DebugInfoUri.java | 29 +-
.../core/debug/ODataDebugResponseWrapper.java | 31 +-
.../odata2/core/edm/AbstractSimpleType.java | 40 +-
.../org/apache/olingo/odata2/core/edm/Bit.java | 34 +-
.../olingo/odata2/core/edm/EdmBinary.java | 40 +-
.../olingo/odata2/core/edm/EdmBoolean.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmByte.java | 37 +-
.../olingo/odata2/core/edm/EdmDateTime.java | 49 +-
.../odata2/core/edm/EdmDateTimeOffset.java | 50 +-
.../olingo/odata2/core/edm/EdmDecimal.java | 49 +-
.../olingo/odata2/core/edm/EdmDouble.java | 49 +-
.../apache/olingo/odata2/core/edm/EdmGuid.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmImpl.java | 33 +-
.../apache/olingo/odata2/core/edm/EdmInt16.java | 37 +-
.../apache/olingo/odata2/core/edm/EdmInt32.java | 40 +-
.../apache/olingo/odata2/core/edm/EdmInt64.java | 43 +-
.../apache/olingo/odata2/core/edm/EdmNull.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmSByte.java | 34 +-
.../core/edm/EdmSimpleTypeFacadeImpl.java | 33 +-
.../olingo/odata2/core/edm/EdmSingle.java | 43 +-
.../olingo/odata2/core/edm/EdmString.java | 34 +-
.../apache/olingo/odata2/core/edm/EdmTime.java | 34 +-
.../apache/olingo/odata2/core/edm/Uint7.java | 34 +-
.../edm/provider/EdmAnnotationsImplProv.java | 29 +-
.../edm/provider/EdmAssociationEndImplProv.java | 26 +-
.../edm/provider/EdmAssociationImplProv.java | 29 +-
.../provider/EdmAssociationSetEndImplProv.java | 26 +-
.../edm/provider/EdmAssociationSetImplProv.java | 32 +-
.../provider/EdmComplexPropertyImplProv.java | 26 +-
.../edm/provider/EdmComplexTypeImplProv.java | 29 +-
.../core/edm/provider/EdmElementImplProv.java | 32 +-
.../provider/EdmEntityContainerImplProv.java | 42 +-
.../core/edm/provider/EdmEntitySetImplProv.java | 32 +-
.../edm/provider/EdmEntitySetInfoImplProv.java | 29 +-
.../edm/provider/EdmEntityTypeImplProv.java | 31 +-
.../edm/provider/EdmFunctionImportImplProv.java | 29 +-
.../odata2/core/edm/provider/EdmImplProv.java | 26 +-
.../core/edm/provider/EdmNamedImplProv.java | 26 +-
.../provider/EdmNavigationPropertyImplProv.java | 29 +-
.../core/edm/provider/EdmParameterImplProv.java | 29 +-
.../core/edm/provider/EdmPropertyImplProv.java | 29 +-
.../EdmReferentialConstraintImplProv.java | 10 +-
.../EdmReferentialConstraintRoleImplProv.java | 26 +-
.../provider/EdmServiceMetadataImplProv.java | 26 +-
.../edm/provider/EdmSimplePropertyImplProv.java | 26 +-
.../edm/provider/EdmStructuralTypeImplProv.java | 29 +-
.../core/edm/provider/EdmTypedImplProv.java | 29 +-
.../odata2/core/edm/provider/EdmxProvider.java | 38 +-
.../odata2/core/ep/AtomEntityProvider.java | 104 ++-
.../odata2/core/ep/BasicEntityProvider.java | 77 +-
.../core/ep/ContentTypeBasedEntityProvider.java | 56 +-
.../odata2/core/ep/JsonEntityProvider.java | 97 ++-
.../odata2/core/ep/ProviderFacadeImpl.java | 88 +-
.../aggregator/EntityComplexPropertyInfo.java | 32 +-
.../ep/aggregator/EntityInfoAggregator.java | 102 ++-
.../core/ep/aggregator/EntityPropertyInfo.java | 31 +-
.../core/ep/aggregator/EntityTypeMapping.java | 32 +-
.../ep/aggregator/NavigationPropertyInfo.java | 26 +-
.../consumer/AtomServiceDocumentConsumer.java | 108 ++-
.../core/ep/consumer/JsonEntityConsumer.java | 73 +-
.../core/ep/consumer/JsonEntryConsumer.java | 83 +-
.../core/ep/consumer/JsonFeedConsumer.java | 60 +-
.../core/ep/consumer/JsonLinkConsumer.java | 50 +-
.../core/ep/consumer/JsonPropertyConsumer.java | 81 +-
.../consumer/JsonServiceDocumentConsumer.java | 43 +-
.../core/ep/consumer/XmlEntityConsumer.java | 90 +-
.../core/ep/consumer/XmlEntryConsumer.java | 160 ++--
.../core/ep/consumer/XmlFeedConsumer.java | 56 +-
.../core/ep/consumer/XmlLinkConsumer.java | 46 +-
.../core/ep/consumer/XmlMetadataConsumer.java | 144 ++--
.../core/ep/consumer/XmlPropertyConsumer.java | 60 +-
.../odata2/core/ep/entry/EntryMetadataImpl.java | 29 +-
.../odata2/core/ep/entry/MediaMetadataImpl.java | 29 +-
.../odata2/core/ep/entry/ODataEntryImpl.java | 33 +-
.../odata2/core/ep/feed/FeedMetadataImpl.java | 26 +-
.../odata2/core/ep/feed/ODataFeedImpl.java | 26 +-
.../ep/producer/AtomEntryEntityProducer.java | 110 ++-
.../core/ep/producer/AtomFeedProducer.java | 58 +-
.../producer/AtomServiceDocumentProducer.java | 77 +-
.../producer/JsonCollectionEntityProducer.java | 43 +-
.../ep/producer/JsonEntryEntityProducer.java | 70 +-
.../ep/producer/JsonErrorDocumentProducer.java | 41 +-
.../ep/producer/JsonFeedEntityProducer.java | 34 +-
.../ep/producer/JsonLinkEntityProducer.java | 34 +-
.../ep/producer/JsonLinksEntityProducer.java | 37 +-
.../ep/producer/JsonPropertyEntityProducer.java | 56 +-
.../producer/JsonServiceDocumentProducer.java | 36 +-
.../core/ep/producer/TombstoneProducer.java | 55 +-
.../producer/XmlCollectionEntityProducer.java | 31 +-
.../ep/producer/XmlErrorDocumentProducer.java | 29 +-
.../core/ep/producer/XmlLinkEntityProducer.java | 31 +-
.../ep/producer/XmlLinksEntityProducer.java | 31 +-
.../core/ep/producer/XmlMetadataProducer.java | 202 +++--
.../ep/producer/XmlPropertyEntityProducer.java | 56 +-
.../odata2/core/ep/util/CircleStreamBuffer.java | 31 +-
.../olingo/odata2/core/ep/util/FormatJson.java | 28 +-
.../olingo/odata2/core/ep/util/FormatXml.java | 28 +-
.../odata2/core/ep/util/JsonStreamWriter.java | 28 +-
.../olingo/odata2/core/ep/util/JsonUtils.java | 42 +-
.../core/ep/util/XmlMetadataConstants.java | 28 +-
.../odata2/core/exception/MessageService.java | 29 +-
.../core/exception/ODataRuntimeException.java | 28 +-
.../processor/ODataSingleProcessorService.java | 39 +-
.../apache/olingo/odata2/core/rest/MERGE.java | 26 +-
.../core/rest/ODataExceptionMapperImpl.java | 50 +-
.../odata2/core/rest/ODataRedirectLocator.java | 26 +-
.../odata2/core/rest/ODataRootLocator.java | 49 +-
.../odata2/core/rest/ODataSubLocator.java | 32 +-
.../apache/olingo/odata2/core/rest/PATCH.java | 26 +-
.../olingo/odata2/core/rest/RestUtil.java | 45 +-
.../odata2/core/rest/SubLocatorParameter.java | 26 +-
.../odata2/core/rest/app/ODataApplication.java | 36 +-
.../odata2/core/rt/RuntimeDelegateImpl.java | 32 +-
.../odata2/core/servicedocument/AcceptImpl.java | 26 +-
.../core/servicedocument/AtomInfoImpl.java | 29 +-
.../core/servicedocument/CategoriesImpl.java | 26 +-
.../core/servicedocument/CategoryImpl.java | 26 +-
.../core/servicedocument/CollectionImpl.java | 26 +-
.../servicedocument/CommonAttributesImpl.java | 26 +-
.../servicedocument/ExtensionAttributeImpl.java | 26 +-
.../servicedocument/ExtensionElementImpl.java | 26 +-
.../servicedocument/ServiceDocumentImpl.java | 26 +-
.../odata2/core/servicedocument/TitleImpl.java | 26 +-
.../core/servicedocument/WorkspaceImpl.java | 26 +-
.../core/uri/ExpandSelectTreeCreator.java | 49 +-
.../core/uri/ExpandSelectTreeNodeImpl.java | 29 +-
.../odata2/core/uri/KeyPredicateImpl.java | 26 +-
.../core/uri/NavigationPropertySegmentImpl.java | 26 +-
.../odata2/core/uri/NavigationSegmentImpl.java | 26 +-
.../olingo/odata2/core/uri/SelectItemImpl.java | 26 +-
.../odata2/core/uri/SystemQueryOption.java | 26 +-
.../olingo/odata2/core/uri/UriInfoImpl.java | 26 +-
.../olingo/odata2/core/uri/UriParserImpl.java | 71 +-
.../apache/olingo/odata2/core/uri/UriType.java | 37 +-
.../uri/expression/ActualBinaryOperator.java | 26 +-
.../uri/expression/BinaryExpressionImpl.java | 29 +-
.../ExpressionParserInternalError.java | 55 +-
.../uri/expression/FilterExpressionImpl.java | 26 +-
.../core/uri/expression/FilterParser.java | 68 +-
.../expression/FilterParserExceptionImpl.java | 92 +-
.../core/uri/expression/FilterParserImpl.java | 523 +++++++-----
.../core/uri/expression/InfoBinaryOperator.java | 34 +-
.../odata2/core/uri/expression/InfoMethod.java | 39 +-
.../core/uri/expression/InfoUnaryOperator.java | 71 +-
.../core/uri/expression/InputTypeValidator.java | 36 +-
.../odata2/core/uri/expression/JsonVisitor.java | 76 +-
.../uri/expression/LiteralExpressionImpl.java | 26 +-
.../uri/expression/MemberExpressionImpl.java | 26 +-
.../uri/expression/MethodExpressionImpl.java | 28 +-
.../uri/expression/OrderByExpressionImpl.java | 26 +-
.../core/uri/expression/OrderByParser.java | 69 +-
.../core/uri/expression/OrderByParserImpl.java | 37 +-
.../uri/expression/OrderExpressionImpl.java | 26 +-
.../core/uri/expression/ParameterSet.java | 68 +-
.../uri/expression/ParameterSetCombination.java | 39 +-
.../uri/expression/PropertyExpressionImpl.java | 28 +-
.../odata2/core/uri/expression/Token.java | 28 +-
.../odata2/core/uri/expression/TokenKind.java | 36 +-
.../odata2/core/uri/expression/TokenList.java | 40 +-
.../odata2/core/uri/expression/Tokenizer.java | 62 +-
.../core/uri/expression/TokenizerException.java | 65 +-
.../uri/expression/TokenizerExpectError.java | 50 +-
.../uri/expression/TokenizerRTException.java | 28 +-
.../uri/expression/UnaryExpressionImpl.java | 26 +-
.../odata2/core/ContentNegotiatorTest.java | 55 +-
.../olingo/odata2/core/DispatcherTest.java | 82 +-
.../odata2/core/ODataContextImplTest.java | 26 +-
.../odata2/core/ODataExceptionWrapperTest.java | 32 +-
.../core/ODataRequestHandlerValidationTest.java | 212 +++--
.../olingo/odata2/core/ODataResponseTest.java | 26 +-
.../olingo/odata2/core/PathSegmentTest.java | 26 +-
.../odata2/core/batch/AcceptParserTest.java | 32 +-
.../core/batch/BatchRequestParserTest.java | 79 +-
.../core/batch/BatchRequestWriterTest.java | 26 +-
.../core/batch/BatchResponseParserTest.java | 28 +-
.../core/batch/BatchResponseWriterTest.java | 29 +-
.../odata2/core/commons/ContentTypeTest.java | 82 +-
.../olingo/odata2/core/commons/DecoderTest.java | 26 +-
.../olingo/odata2/core/commons/EncoderTest.java | 28 +-
.../odata2/core/debug/DebugInfoBodyTest.java | 26 +-
.../debug/ODataDebugResponseWrapperTest.java | 106 ++-
.../olingo/odata2/core/edm/EdmImplTest.java | 26 +-
.../core/edm/EdmSimpleTypeFacadeTest.java | 48 +-
.../odata2/core/edm/EdmSimpleTypeTest.java | 850 ++++++++++++-------
.../provider/EdmAnnotationsImplProvTest.java | 36 +-
.../provider/EdmAssociationEndImplProvTest.java | 30 +-
.../provider/EdmAssociationImplProvTest.java | 37 +-
.../EdmAssociationSetEndImplProvTest.java | 35 +-
.../provider/EdmAssociationSetImplProvTest.java | 37 +-
.../provider/EdmComplexTypeImplProvTest.java | 26 +-
.../EdmEntityContainerImplProvTest.java | 29 +-
.../provider/EdmEntitySetInfoImplProvTest.java | 26 +-
.../core/edm/provider/EdmEntitySetProvTest.java | 37 +-
.../edm/provider/EdmEntityTypeImplProvTest.java | 29 +-
.../provider/EdmFunctionImportImplProvTest.java | 40 +-
.../core/edm/provider/EdmImplProvTest.java | 26 +-
.../core/edm/provider/EdmMappingTest.java | 39 +-
.../core/edm/provider/EdmNamedImplProvTest.java | 26 +-
.../EdmNavigationPropertyImplProvTest.java | 33 +-
.../edm/provider/EdmPropertyImplProvTest.java | 38 +-
.../EdmReferentialConstraintImplProvTest.java | 26 +-
...dmReferentialConstraintRoleImplProvTest.java | 26 +-
.../EdmServiceMetadataImplProvTest.java | 102 ++-
.../core/edm/provider/EdmxProviderTest.java | 32 +-
.../odata2/core/ep/AbstractProviderTest.java | 38 +-
.../core/ep/AbstractXmlProducerTestHelper.java | 38 +-
.../odata2/core/ep/BasicProviderTest.java | 102 ++-
.../odata2/core/ep/LoadXMLFactoryTest.java | 30 +-
.../ep/ODataEntityProviderPropertiesTest.java | 26 +-
.../olingo/odata2/core/ep/PerformanceTest.java | 32 +-
.../odata2/core/ep/ProviderFacadeImplTest.java | 96 ++-
.../ep/aggregator/EntityInfoAggregatorTest.java | 26 +-
.../core/ep/consumer/AbstractConsumerTest.java | 49 +-
.../AtomServiceDocumentConsumerTest.java | 29 +-
.../core/ep/consumer/JsonEntryConsumerTest.java | 37 +-
.../consumer/JsonEntryDeepInsertEntryTest.java | 43 +-
.../consumer/JsonEntryDeepInsertFeedTest.java | 41 +-
.../core/ep/consumer/JsonFeedConsumerTest.java | 50 +-
.../core/ep/consumer/JsonLinkConsumerTest.java | 26 +-
.../ep/consumer/JsonPropertyConsumerTest.java | 206 +++--
.../JsonServiceDocumentConsumerTest.java | 26 +-
.../consumer/ServiceDocumentConsumerTest.java | 26 +-
.../core/ep/consumer/XmlEntityConsumerTest.java | 677 ++++++++++-----
.../core/ep/consumer/XmlFeedConsumerTest.java | 28 +-
.../core/ep/consumer/XmlLinkConsumerTest.java | 33 +-
.../ep/consumer/XmlMetadataConsumerTest.java | 620 ++++++++++++--
.../ep/consumer/XmlPropertyConsumerTest.java | 104 ++-
.../core/ep/producer/AtomEntryProducerTest.java | 203 +++--
.../core/ep/producer/AtomFeedProducerTest.java | 50 +-
.../AtomServiceDocumentProducerTest.java | 62 +-
.../producer/JsonEntryEntityProducerTest.java | 106 ++-
.../core/ep/producer/JsonErrorProducerTest.java | 33 +-
.../ep/producer/JsonFeedEntityProducerTest.java | 26 +-
.../ep/producer/JsonFunctionImportTest.java | 47 +-
.../ep/producer/JsonLinkEntityProducerTest.java | 26 +-
.../producer/JsonLinksEntityProducerTest.java | 26 +-
.../ep/producer/JsonPropertyProducerTest.java | 62 +-
.../JsonServiceDocumentProducerTest.java | 26 +-
.../odata2/core/ep/producer/MyCallback.java | 44 +-
.../producer/ServiceDocumentProducerTest.java | 29 +-
.../core/ep/producer/TombstoneCallbackImpl.java | 26 +-
.../core/ep/producer/TombstoneProducerTest.java | 88 +-
.../core/ep/producer/XmlErrorProducerTest.java | 36 +-
.../core/ep/producer/XmlExpandProducerTest.java | 163 ++--
.../XmlFeedWithTombstonesProducerTest.java | 53 +-
.../core/ep/producer/XmlFunctionImportTest.java | 59 +-
.../ep/producer/XmlLinkEntityProducerTest.java | 26 +-
.../ep/producer/XmlLinksEntityProducerTest.java | 26 +-
.../ep/producer/XmlMetadataProducerTest.java | 116 ++-
.../ep/producer/XmlPropertyProducerTest.java | 43 +-
.../core/ep/producer/XmlSelectProducerTest.java | 104 ++-
.../core/ep/util/CircleStreamBufferTest.java | 26 +-
.../core/ep/util/JsonStreamWriterTest.java | 26 +-
.../core/exception/MessageReferenceTest.java | 29 +-
.../core/exception/MessageServiceTest.java | 52 +-
.../core/exception/ODataExceptionTest.java | 33 +-
.../exception/ODataMessageTextVerifierTest.java | 40 +-
.../ODataSingleProcessorServiceTest.java | 29 +-
.../rest/ODataErrorHandlerCallbackImpl.java | 29 +-
.../core/rest/ODataExceptionMapperImplTest.java | 73 +-
.../core/rest/ODataServiceFactoryImpl.java | 26 +-
.../odata2/core/rt/RuntimeDelegateTest.java | 26 +-
.../uri/ExpandSelectTreeCreatorImplTest.java | 280 +++---
.../odata2/core/uri/QueryOptionsEnumTest.java | 26 +-
.../olingo/odata2/core/uri/UriInfoTest.java | 36 +-
.../odata2/core/uri/UriParserFacadeTest.java | 26 +-
.../olingo/odata2/core/uri/UriParserTest.java | 63 +-
.../uri/expression/FilterParserImplTool.java | 57 +-
.../core/uri/expression/FilterToJsonTest.java | 38 +-
.../odata2/core/uri/expression/ParserTool.java | 57 +-
.../uri/expression/TestAbapCompatibility.java | 391 +++++----
.../odata2/core/uri/expression/TestBase.java | 26 +-
.../core/uri/expression/TestExceptionTexts.java | 26 +-
.../odata2/core/uri/expression/TestParser.java | 69 +-
.../uri/expression/TestParserExceptions.java | 581 ++++++++-----
.../odata2/core/uri/expression/TestSpec.java | 117 +--
.../core/uri/expression/TestTokenizer.java | 77 +-
.../odata2/core/uri/expression/TokenTool.java | 38 +-
.../odata2/core/uri/expression/VisitorTool.java | 41 +-
310 files changed, 10384 insertions(+), 7416 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
index 8994d57..824cf83 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -28,7 +28,6 @@ import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
import org.apache.olingo.odata2.api.exception.ODataException;
import org.apache.olingo.odata2.api.exception.ODataNotAcceptableException;
import org.apache.olingo.odata2.api.processor.ODataRequest;
-import org.apache.olingo.odata2.api.uri.UriInfo;
import org.apache.olingo.odata2.core.commons.ContentType;
import org.apache.olingo.odata2.core.uri.UriInfoImpl;
import org.apache.olingo.odata2.core.uri.UriType;
@@ -41,53 +40,59 @@ public class ContentNegotiator {
private static final String URI_INFO_FORMAT_ATOM = "atom";
private static final String URI_INFO_FORMAT_XML = "xml";
static final String DEFAULT_CHARSET = "utf-8";
-
+
/**
- * Do the content negotiation for <code>accept header value</code> based on
- * requested content type (in HTTP accept header from {@link ODataRequest})
- * in combination with uri information from {@link UriInfo}
- * and from given supported content types (via <code>supportedContentTypes</code>).
+ * Do the content negotiation for <code>accept header value</code> based on
+ * requested content type (in HTTP accept header from {@link ODataRequest})
+ * in combination with uri information from {@link org.apache.olingo.odata2.api.uri.UriInfo} and from given supported
+ * content types (via
+ * <code>supportedContentTypes</code>).
*
* @param request specific request
* @param uriInfo specific uri information
* @param supportedContentTypes list of supported content types
- * @return best fitting content type or <code>NULL</code> if content type is not set and for given {@link UriInfo} is ignored
+ * @return best fitting content type or <code>NULL</code> if content type is not set and for given
+ * {@link org.apache.olingo.odata2.api.uri.UriInfo} is
+ * ignored
* @throws ODataException if no supported content type was found
* @throws IllegalArgumentException if one of the input parameter is <code>NULL</code>
*/
- public ContentType doContentNegotiation(ODataRequest odataRequest, UriInfoImpl uriInfo, List<String> supportedContentTypes) throws ODataException {
+ public ContentType doContentNegotiation(final ODataRequest odataRequest, final UriInfoImpl uriInfo,
+ final List<String> supportedContentTypes) throws ODataException {
validateNotNull(odataRequest, uriInfo, supportedContentTypes);
- if(uriInfo.isCount()) {
+ if (uriInfo.isCount()) {
return ContentType.TEXT_PLAIN_CS_UTF_8;
- } else if(uriInfo.isValue()) {
- if(uriInfo.getUriType() == UriType.URI5 || uriInfo.getUriType() == UriType.URI4) {
- return ContentType.TEXT_PLAIN_CS_UTF_8;
+ } else if (uriInfo.isValue()) {
+ if (uriInfo.getUriType() == UriType.URI5 || uriInfo.getUriType() == UriType.URI4) {
+ return ContentType.TEXT_PLAIN_CS_UTF_8;
}
return doContentNegotiationForAcceptHeader(Arrays.asList("*/*"), ContentType.create(supportedContentTypes));
- }
-
+ }
+
if (uriInfo.getFormat() == null) {
- return doContentNegotiationForAcceptHeader(odataRequest.getAcceptHeaders(), ContentType.create(supportedContentTypes));
+ return doContentNegotiationForAcceptHeader(odataRequest.getAcceptHeaders(), ContentType
+ .create(supportedContentTypes));
} else {
return doContentNegotiationForFormat(uriInfo, ContentType.createAsCustom(supportedContentTypes));
}
}
- private void validateNotNull(ODataRequest odataRequest, UriInfoImpl uriInfo, List<String> supportedContentTypes) {
- if(uriInfo == null) {
+ private void validateNotNull(final ODataRequest odataRequest, final UriInfoImpl uriInfo,
+ final List<String> supportedContentTypes) {
+ if (uriInfo == null) {
throw new IllegalArgumentException("Parameter uriInfo MUST NOT be null.");
}
- if(odataRequest == null) {
+ if (odataRequest == null) {
throw new IllegalArgumentException("Parameter odataRequest MUST NOT be null.");
}
- if(supportedContentTypes == null) {
+ if (supportedContentTypes == null) {
throw new IllegalArgumentException("Parameter supportedContentTypes MUST NOT be null.");
}
}
-
- private ContentType doContentNegotiationForFormat(final UriInfoImpl uriInfo, final List<ContentType> supportedContentTypes) throws ODataException {
+ private ContentType doContentNegotiationForFormat(final UriInfoImpl uriInfo,
+ final List<ContentType> supportedContentTypes) throws ODataException {
validateFormatQuery(uriInfo);
ContentType formatContentType = mapFormat(uriInfo);
formatContentType = ensureCharset(formatContentType);
@@ -98,7 +103,8 @@ public class ContentNegotiator {
}
}
- throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_CONTENT_TYPE.addContent(uriInfo.getFormat()));
+ throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_CONTENT_TYPE.addContent(uriInfo
+ .getFormat()));
}
/**
@@ -122,9 +128,9 @@ public class ContentNegotiator {
if (uriInfo.getUriType() == UriType.URI0) {
// special handling for serviceDocument uris (UriType.URI0)
return ContentType.APPLICATION_ATOM_SVC;
- } else if(uriInfo.getUriType() == UriType.URI1) {
- return ContentType.APPLICATION_ATOM_XML_FEED;
- } else if(uriInfo.getUriType()==UriType.URI2) {
+ } else if (uriInfo.getUriType() == UriType.URI1) {
+ return ContentType.APPLICATION_ATOM_XML_FEED;
+ } else if (uriInfo.getUriType() == UriType.URI2) {
return ContentType.APPLICATION_ATOM_XML_ENTRY;
}
} else if (URI_INFO_FORMAT_JSON.equals(format)) {
@@ -134,11 +140,13 @@ public class ContentNegotiator {
return ContentType.createAsCustom(format);
}
- private ContentType doContentNegotiationForAcceptHeader(final List<String> acceptHeaderContentTypes, final List<ContentType> supportedContentTypes) throws ODataException {
+ private ContentType doContentNegotiationForAcceptHeader(final List<String> acceptHeaderContentTypes,
+ final List<ContentType> supportedContentTypes) throws ODataException {
return contentNegotiation(extractAcceptHeaders(acceptHeaderContentTypes), supportedContentTypes);
}
- private List<ContentType> extractAcceptHeaders(final List<String> acceptHeaderValues) throws ODataBadRequestException {
+ private List<ContentType> extractAcceptHeaders(final List<String> acceptHeaderValues)
+ throws ODataBadRequestException {
final List<ContentType> mediaTypes = new ArrayList<ContentType>();
if (acceptHeaderValues != null) {
for (final String mediaType : acceptHeaderValues) {
@@ -154,7 +162,8 @@ public class ContentNegotiator {
return mediaTypes;
}
- ContentType contentNegotiation(final List<ContentType> acceptedContentTypes, final List<ContentType> supportedContentTypes) throws ODataException {
+ ContentType contentNegotiation(final List<ContentType> acceptedContentTypes,
+ final List<ContentType> supportedContentTypes) throws ODataException {
final Set<ContentType> setSupported = new HashSet<ContentType>(supportedContentTypes);
if (acceptedContentTypes.isEmpty()) {
@@ -171,12 +180,13 @@ public class ContentNegotiator {
}
}
- throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_ACCEPT_HEADER.addContent(acceptedContentTypes.toString()));
+ throw new ODataNotAcceptableException(ODataNotAcceptableException.NOT_SUPPORTED_ACCEPT_HEADER
+ .addContent(acceptedContentTypes.toString()));
}
- private ContentType ensureCharset(ContentType contentType) {
- if(ContentType.APPLICATION_ATOM_XML.isCompatible(contentType)
- || ContentType.APPLICATION_ATOM_SVC.isCompatible(contentType)
+ private ContentType ensureCharset(final ContentType contentType) {
+ if (ContentType.APPLICATION_ATOM_XML.isCompatible(contentType)
+ || ContentType.APPLICATION_ATOM_SVC.isCompatible(contentType)
|| ContentType.APPLICATION_XML.isCompatible(contentType)) {
return contentType.receiveWithCharsetParameter(DEFAULT_CHARSET);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
index f0db8af..5809bfd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
/**
* Request dispatching according to URI type and HTTP method.
- *
+ *
*/
public class Dispatcher {
@@ -60,7 +60,8 @@ public class Dispatcher {
this.serviceFactory = serviceFactory;
}
- public ODataResponse dispatch(final ODataHttpMethod method, final UriInfoImpl uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
+ public ODataResponse dispatch(final ODataHttpMethod method, final UriInfoImpl uriInfo, final InputStream content,
+ final String requestContentType, final String contentType) throws ODataException {
switch (uriInfo.getUriType()) {
case URI0:
if (method == ODataHttpMethod.GET) {
@@ -100,10 +101,12 @@ public class Dispatcher {
case GET:
return service.getEntityComplexPropertyProcessor().readEntityComplexProperty(uriInfo, contentType);
case PUT:
- return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content, requestContentType, false, contentType);
+ return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content,
+ requestContentType, false, contentType);
case PATCH:
case MERGE:
- return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content, requestContentType, true, contentType);
+ return service.getEntityComplexPropertyProcessor().updateEntityComplexProperty(uriInfo, content,
+ requestContentType, true, contentType);
default:
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
@@ -121,9 +124,11 @@ public class Dispatcher {
case PATCH:
case MERGE:
if (uriInfo.isValue()) {
- return service.getEntitySimplePropertyValueProcessor().updateEntitySimplePropertyValue(uriInfo, content, requestContentType, contentType);
+ return service.getEntitySimplePropertyValueProcessor().updateEntitySimplePropertyValue(uriInfo, content,
+ requestContentType, contentType);
} else {
- return service.getEntitySimplePropertyProcessor().updateEntitySimpleProperty(uriInfo, content, requestContentType, contentType);
+ return service.getEntitySimplePropertyProcessor().updateEntitySimpleProperty(uriInfo, content,
+ requestContentType, contentType);
}
case DELETE:
if (uriInfo.isValue()) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
index a820742..aba98ee 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -219,7 +219,8 @@ public class ODataContextImpl implements ODataContext {
@Override
public String toString() {
- return className + "." + methodName + ": duration: " + (timeStopped - timeStarted) + ", memory: " + (memoryStopped - memoryStarted);
+ return className + "." + methodName + ": duration: " + (timeStopped - timeStarted) + ", memory: "
+ + (memoryStopped - memoryStarted);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
index 38abe1d..4d4fad8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -70,7 +70,8 @@ public class ODataExceptionWrapper {
private final ODataErrorContext errorContext = new ODataErrorContext();
private final URI requestUri;
- public ODataExceptionWrapper(final ODataContext context, final Map<String, String> queryParameters, final List<String> acceptHeaderContentTypes) {
+ public ODataExceptionWrapper(final ODataContext context, final Map<String, String> queryParameters,
+ final List<String> acceptHeaderContentTypes) {
contentType = getContentType(queryParameters, acceptHeaderContentTypes).toContentTypeString();
messageLocale = MessageService.getSupportedLocale(getLanguages(context), DEFAULT_RESPONSE_LOCALE);
httpRequestHeaders = context.getRequestHeaders();
@@ -83,7 +84,8 @@ public class ODataExceptionWrapper {
}
}
- public ODataExceptionWrapper(final UriInfo uriInfo, final HttpHeaders httpHeaders, final ServletConfig servletConfig, final HttpServletRequest servletRequest) {
+ public ODataExceptionWrapper(final UriInfo uriInfo, final HttpHeaders httpHeaders, final ServletConfig servletConfig,
+ final HttpServletRequest servletRequest) {
contentType = getContentType(uriInfo, httpHeaders).toContentTypeString();
messageLocale = MessageService.getSupportedLocale(getLanguages(httpHeaders), DEFAULT_RESPONSE_LOCALE);
httpRequestHeaders = httpHeaders.getRequestHeaders();
@@ -111,7 +113,7 @@ public class ODataExceptionWrapper {
} else {
oDataResponse = EntityProvider.writeErrorDocument(errorContext);
}
- if(!oDataResponse.containsHeader(org.apache.olingo.odata2.api.commons.HttpHeaders.CONTENT_TYPE)) {
+ if (!oDataResponse.containsHeader(org.apache.olingo.odata2.api.commons.HttpHeaders.CONTENT_TYPE)) {
oDataResponse = ODataResponse.fromResponse(oDataResponse).contentHeader(contentType).build();
}
return oDataResponse;
@@ -231,7 +233,8 @@ public class ODataExceptionWrapper {
}
}
- private ContentType getContentType(final Map<String, String> queryParameters, final List<String> acceptHeaderContentTypes) {
+ private ContentType getContentType(final Map<String, String> queryParameters,
+ final List<String> acceptHeaderContentTypes) {
ContentType contentType = getContentTypeByUriInfo(queryParameters);
if (contentType == null) {
contentType = getContentTypeByAcceptHeader(acceptHeaderContentTypes);
@@ -247,8 +250,9 @@ public class ODataExceptionWrapper {
if (DOLLAR_FORMAT_JSON.equals(contentTypeString)) {
contentType = ContentType.APPLICATION_JSON;
} else {
- //Any format mentioned in the $format parameter other than json results in an application/xml content type for error messages
- //due to the OData V2 Specification
+ // Any format mentioned in the $format parameter other than json results in an application/xml content type
+ // for error messages
+ // due to the OData V2 Specification
contentType = ContentType.APPLICATION_XML;
}
}
@@ -261,10 +265,13 @@ public class ODataExceptionWrapper {
if (ContentType.isParseable(acceptContentType)) {
ContentType convertedContentType = ContentType.create(acceptContentType);
if (convertedContentType.isWildcard()
- || ContentType.APPLICATION_XML.equals(convertedContentType) || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
- || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType) || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
+ || ContentType.APPLICATION_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_XML;
- } else if (ContentType.APPLICATION_JSON.equals(convertedContentType) || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
+ } else if (ContentType.APPLICATION_JSON.equals(convertedContentType)
+ || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_JSON;
}
}
@@ -289,8 +296,8 @@ public class ODataExceptionWrapper {
if (DOLLAR_FORMAT_JSON.equals(contentTypeString)) {
contentType = ContentType.APPLICATION_JSON;
} else {
- //Any format mentioned in the $format parameter other than json results in an application/xml content type
- //for error messages due to the OData V2 Specification.
+ // Any format mentioned in the $format parameter other than json results in an application/xml content type
+ // for error messages due to the OData V2 Specification.
contentType = ContentType.APPLICATION_XML;
}
}
@@ -303,10 +310,13 @@ public class ODataExceptionWrapper {
if (ContentType.isParseable(type.toString())) {
ContentType convertedContentType = ContentType.create(type.toString());
if (convertedContentType.isWildcard()
- || ContentType.APPLICATION_XML.equals(convertedContentType) || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
- || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType) || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
+ || ContentType.APPLICATION_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_XML_CS_UTF_8.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML.equals(convertedContentType)
+ || ContentType.APPLICATION_ATOM_XML_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_XML;
- } else if (ContentType.APPLICATION_JSON.equals(convertedContentType) || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
+ } else if (ContentType.APPLICATION_JSON.equals(convertedContentType)
+ || ContentType.APPLICATION_JSON_CS_UTF_8.equals(convertedContentType)) {
return ContentType.APPLICATION_JSON;
}
}
@@ -314,14 +324,17 @@ public class ODataExceptionWrapper {
return ContentType.APPLICATION_XML;
}
- private ODataErrorCallback getErrorHandlerCallbackFromContext(final ODataContext context) throws ClassNotFoundException, InstantiationException, IllegalAccessException {
+ private ODataErrorCallback getErrorHandlerCallbackFromContext(final ODataContext context)
+ throws ClassNotFoundException, InstantiationException, IllegalAccessException {
ODataErrorCallback callback = null;
ODataServiceFactory serviceFactory = context.getServiceFactory();
callback = serviceFactory.getCallback(ODataErrorCallback.class);
return callback;
}
- private ODataErrorCallback getErrorHandlerCallbackFromServletConfig(final ServletConfig servletConfig, final HttpServletRequest servletRequest) throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+ private ODataErrorCallback getErrorHandlerCallbackFromServletConfig(final ServletConfig servletConfig,
+ final HttpServletRequest servletRequest) throws InstantiationException, IllegalAccessException,
+ ClassNotFoundException {
ODataErrorCallback callback = null;
final String factoryClassName = servletConfig.getInitParameter(ODataServiceFactory.FACTORY_LABEL);
if (factoryClassName != null) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
index 48948ac..94de51d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
index 9d02912..d9dc33a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
@@ -69,7 +69,8 @@ public class ODataRequestHandler {
private final ODataService service;
private final ODataContext context;
- public ODataRequestHandler(final ODataServiceFactory factory, final ODataService service, final ODataContext context) {
+ public ODataRequestHandler(final ODataServiceFactory factory, final ODataService service,
+ final ODataContext context) {
serviceFactory = factory;
this.service = service;
this.context = context;
@@ -103,44 +104,52 @@ public class ODataRequestHandler {
final ODataHttpMethod method = request.getMethod();
validateMethodAndUri(method, uriInfo);
- if (method == ODataHttpMethod.POST || method == ODataHttpMethod.PUT || method == ODataHttpMethod.PATCH || method == ODataHttpMethod.MERGE) {
+ if (method == ODataHttpMethod.POST || method == ODataHttpMethod.PUT || method == ODataHttpMethod.PATCH
+ || method == ODataHttpMethod.MERGE) {
checkRequestContentType(uriInfo, request.getContentType());
}
List<String> supportedContentTypes = getSupportedContentTypes(uriInfo, method);
- ContentType acceptContentType = new ContentNegotiator().doContentNegotiation(request, uriInfo, supportedContentTypes);
+ ContentType acceptContentType =
+ new ContentNegotiator().doContentNegotiation(request, uriInfo, supportedContentTypes);
timingHandle2 = context.startRuntimeMeasurement("Dispatcher", "dispatch");
- odataResponse = dispatcher.dispatch(method, uriInfo, request.getBody(), request.getContentType(), acceptContentType.toContentTypeString());
+ odataResponse =
+ dispatcher.dispatch(method, uriInfo, request.getBody(), request.getContentType(), acceptContentType
+ .toContentTypeString());
context.stopRuntimeMeasurement(timingHandle2);
-
ODataResponseBuilder extendedResponse = ODataResponse.fromResponse(odataResponse);
final UriType uriType = uriInfo.getUriType();
- final String location = (method == ODataHttpMethod.POST && (uriType == UriType.URI1 || uriType == UriType.URI6B)) ? odataResponse.getIdLiteral() : null;
+ final String location =
+ (method == ODataHttpMethod.POST && (uriType == UriType.URI1 || uriType == UriType.URI6B)) ? odataResponse
+ .getIdLiteral() : null;
final HttpStatusCodes s = getStatusCode(odataResponse, method, uriType);
extendedResponse = extendedResponse.idLiteral(location).status(s);
-
+
if (!odataResponse.containsHeader(ODataHttpHeaders.DATASERVICEVERSION)) {
extendedResponse = extendedResponse.header(ODataHttpHeaders.DATASERVICEVERSION, serverDataServiceVersion);
}
- if(!HttpStatusCodes.NO_CONTENT.equals(s) && !odataResponse.containsHeader(HttpHeaders.CONTENT_TYPE)) {
+ if (!HttpStatusCodes.NO_CONTENT.equals(s) && !odataResponse.containsHeader(HttpHeaders.CONTENT_TYPE)) {
extendedResponse.header(HttpHeaders.CONTENT_TYPE, acceptContentType.toContentTypeString());
}
-
-
+
odataResponse = extendedResponse.build();
} catch (final Exception e) {
exception = e;
- odataResponse = new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders()).wrapInExceptionResponse(e);
+ odataResponse =
+ new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders())
+ .wrapInExceptionResponse(e);
}
context.stopRuntimeMeasurement(timingHandle);
final String debugValue = getDebugValue(context, request.getQueryParameters());
- return debugValue == null ? odataResponse : new ODataDebugResponseWrapper(context, odataResponse, uriInfo, exception, debugValue).wrapResponse();
+ return debugValue == null ? odataResponse : new ODataDebugResponseWrapper(context, odataResponse, uriInfo,
+ exception, debugValue).wrapResponse();
}
- private HttpStatusCodes getStatusCode(ODataResponse odataResponse, final ODataHttpMethod method, final UriType uriType) {
+ private HttpStatusCodes getStatusCode(final ODataResponse odataResponse, final ODataHttpMethod method,
+ final UriType uriType) {
if (odataResponse.getStatus() == null) {
if (method == ODataHttpMethod.POST) {
if (uriType == UriType.URI9) {
@@ -159,25 +168,29 @@ public class ODataRequestHandler {
}
return odataResponse.getStatus();
}
-
+
private String getServerDataServiceVersion() throws ODataException {
return service.getVersion() == null ? ODataServiceVersion.V20 : service.getVersion();
}
- private static void validateDataServiceVersion(final String serverDataServiceVersion, final String requestDataServiceVersion) throws ODataException {
+ private static void validateDataServiceVersion(final String serverDataServiceVersion,
+ final String requestDataServiceVersion) throws ODataException {
if (requestDataServiceVersion != null) {
try {
final boolean isValid = ODataServiceVersion.validateDataServiceVersion(requestDataServiceVersion);
if (!isValid || ODataServiceVersion.isBiggerThan(requestDataServiceVersion, serverDataServiceVersion)) {
- throw new ODataBadRequestException(ODataBadRequestException.VERSIONERROR.addContent(requestDataServiceVersion.toString()));
+ throw new ODataBadRequestException(ODataBadRequestException.VERSIONERROR.addContent(requestDataServiceVersion
+ .toString()));
}
} catch (final IllegalArgumentException e) {
- throw new ODataBadRequestException(ODataBadRequestException.PARSEVERSIONERROR.addContent(requestDataServiceVersion), e);
+ throw new ODataBadRequestException(ODataBadRequestException.PARSEVERSIONERROR
+ .addContent(requestDataServiceVersion), e);
}
}
}
- private static void validateMethodAndUri(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
+ private static void validateMethodAndUri(final ODataHttpMethod method, final UriInfoImpl uriInfo)
+ throws ODataException {
validateUriMethod(method, uriInfo);
checkFunctionImport(method, uriInfo);
if (method != ODataHttpMethod.GET) {
@@ -211,20 +224,23 @@ public class ODataRequestHandler {
case URI2:
case URI6A:
case URI7A:
- if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+ if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE
+ && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
case URI3:
- if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+ if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.PATCH
+ && method != ODataHttpMethod.MERGE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
case URI4:
case URI5:
- if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+ if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE
+ && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
} else if (method == ODataHttpMethod.DELETE && !uriInfo.isValue()) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
@@ -248,7 +264,7 @@ public class ODataRequestHandler {
if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
} else {
- if(uriInfo.getFormat() != null) {
+ if (uriInfo.getFormat() != null) {
// throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
throw new ODataBadRequestException(ODataBadRequestException.INVALID_SYNTAX);
}
@@ -260,17 +276,22 @@ public class ODataRequestHandler {
}
}
- private static void checkFunctionImport(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
- if (uriInfo.getFunctionImport() != null && uriInfo.getFunctionImport().getHttpMethod() != null && !uriInfo.getFunctionImport().getHttpMethod().equals(method.toString())) {
+ private static void checkFunctionImport(final ODataHttpMethod method, final UriInfoImpl uriInfo)
+ throws ODataException {
+ if (uriInfo.getFunctionImport() != null && uriInfo.getFunctionImport().getHttpMethod() != null
+ && !uriInfo.getFunctionImport().getHttpMethod().equals(method.toString())) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
}
- private static void checkNotGetSystemQueryOptions(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
+ private static void checkNotGetSystemQueryOptions(final ODataHttpMethod method, final UriInfoImpl uriInfo)
+ throws ODataException {
switch (uriInfo.getUriType()) {
case URI1:
case URI6B:
- if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null || uriInfo.getTop() != null || !uriInfo.getExpand().isEmpty() || !uriInfo.getSelect().isEmpty()) {
+ if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null
+ || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null
+ || uriInfo.getTop() != null || !uriInfo.getExpand().isEmpty() || !uriInfo.getSelect().isEmpty()) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
@@ -308,7 +329,9 @@ public class ODataRequestHandler {
break;
case URI7B:
- if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null || uriInfo.getTop() != null) {
+ if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null
+ || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null
+ || uriInfo.getTop() != null) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
break;
@@ -350,7 +373,8 @@ public class ODataRequestHandler {
}
private static void checkProperty(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
- if ((uriInfo.getUriType() == UriType.URI4 || uriInfo.getUriType() == UriType.URI5) && (isPropertyKey(uriInfo) || method == ODataHttpMethod.DELETE && !isPropertyNullable(getProperty(uriInfo)))) {
+ if ((uriInfo.getUriType() == UriType.URI4 || uriInfo.getUriType() == UriType.URI5)
+ && (isPropertyKey(uriInfo) || method == ODataHttpMethod.DELETE && !isPropertyNullable(getProperty(uriInfo)))) {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
}
}
@@ -370,13 +394,13 @@ public class ODataRequestHandler {
/**
* <p>Checks if <code>content type</code> is a valid request content type for the given {@link UriInfoImpl}.</p>
- * <p>If the combination of <code>content type</code> and {@link UriInfoImpl}
- * is not valid, an {@link ODataUnsupportedMediaTypeException} is thrown.</p>
+ * <p>If the combination of <code>content type</code> and {@link UriInfoImpl} is not valid, an
+ * {@link ODataUnsupportedMediaTypeException} is thrown.</p>
* @param uriInfo information about request URI
* @param contentType request content type
* @throws ODataException in the case of an error during {@link UriInfoImpl} access;
- * if the combination of <code>content type</code> and {@link UriInfoImpl}
- * is invalid, as {@link ODataUnsupportedMediaTypeException}
+ * if the combination of <code>content type</code> and {@link UriInfoImpl} is invalid, as
+ * {@link ODataUnsupportedMediaTypeException}
*/
private void checkRequestContentType(final UriInfoImpl uriInfo, final String contentType) throws ODataException {
Class<? extends ODataProcessor> processorFeature = Dispatcher.mapUriTypeToProcessorFeature(uriInfo);
@@ -389,7 +413,7 @@ public class ODataRequestHandler {
// Adjust processor feature.
if (processorFeature == EntitySetProcessor.class) {
- processorFeature = uriInfo.getTargetEntitySet().getEntityType().hasStream() ? EntityMediaProcessor.class : // A media resource can have any type.
+ processorFeature = uriInfo.getTargetEntitySet().getEntityType().hasStream() ? EntityMediaProcessor.class :
EntityProcessor.class; // The request must contain a single entity!
} else if (processorFeature == EntityLinksProcessor.class) {
processorFeature = EntityLinkProcessor.class; // The request must contain a single link!
@@ -397,25 +421,30 @@ public class ODataRequestHandler {
final ContentType parsedContentType = ContentType.parse(contentType);
if (parsedContentType == null || parsedContentType.hasWildcard()) {
- throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED.addContent(parsedContentType));
+ throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED
+ .addContent(parsedContentType));
}
// Get list of supported content types based on processor feature.
- final List<ContentType> supportedContentTypes = processorFeature == EntitySimplePropertyValueProcessor.class ? getSupportedContentTypes(getProperty(uriInfo)) : getSupportedContentTypes(processorFeature);
+ final List<ContentType> supportedContentTypes =
+ processorFeature == EntitySimplePropertyValueProcessor.class ? getSupportedContentTypes(getProperty(uriInfo))
+ : getSupportedContentTypes(processorFeature);
if (!hasMatchingContentType(parsedContentType, supportedContentTypes)) {
- throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED.addContent(parsedContentType));
+ throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED
+ .addContent(parsedContentType));
}
}
/**
- * Checks if the given list of {@link ContentType}s contains a matching {@link ContentType}
- * for the given <code>contentType</code> parameter.
+ * Checks if the given list of {@link ContentType}s contains a matching {@link ContentType} for the given
+ * <code>contentType</code> parameter.
* @param contentType for which a matching content type is searched
* @param allowedContentTypes list against which is checked for possible matching {@link ContentType}s
* @return <code>true</code> if a matching content type is in given list, otherwise <code>false</code>
*/
- private static boolean hasMatchingContentType(final ContentType contentType, final List<ContentType> allowedContentTypes) {
+ private static boolean hasMatchingContentType(final ContentType contentType,
+ final List<ContentType> allowedContentTypes) {
final ContentType requested = contentType.receiveWithCharsetParameter(ContentNegotiator.DEFAULT_CHARSET);
if (requested.getODataFormat() == ODataFormat.CUSTOM || requested.getODataFormat() == ODataFormat.MIME) {
return requested.hasCompatible(allowedContentTypes);
@@ -424,10 +453,13 @@ public class ODataRequestHandler {
}
private static List<ContentType> getSupportedContentTypes(final EdmProperty property) throws EdmException {
- return property.getType() == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance() ? Arrays.asList(property.getMimeType() == null ? ContentType.WILDCARD : ContentType.create(property.getMimeType())) : Arrays.asList(ContentType.TEXT_PLAIN, ContentType.TEXT_PLAIN_CS_UTF_8);
+ return property.getType() == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance() ? Arrays.asList(property
+ .getMimeType() == null ? ContentType.WILDCARD : ContentType.create(property.getMimeType())) : Arrays.asList(
+ ContentType.TEXT_PLAIN, ContentType.TEXT_PLAIN_CS_UTF_8);
}
- private List<String> getSupportedContentTypes(final UriInfoImpl uriInfo, ODataHttpMethod method) throws ODataException {
+ private List<String> getSupportedContentTypes(final UriInfoImpl uriInfo, final ODataHttpMethod method)
+ throws ODataException {
Class<? extends ODataProcessor> processorFeature = Dispatcher.mapUriTypeToProcessorFeature(uriInfo);
if (ODataHttpMethod.POST.equals(method)) {
UriType uriType = uriInfo.getUriType();
@@ -438,7 +470,8 @@ public class ODataRequestHandler {
return service.getSupportedContentTypes(processorFeature);
}
- private List<ContentType> getSupportedContentTypes(final Class<? extends ODataProcessor> processorFeature) throws ODataException {
+ private List<ContentType> getSupportedContentTypes(final Class<? extends ODataProcessor> processorFeature)
+ throws ODataException {
return ContentType.createAsCustom(service.getSupportedContentTypes(processorFeature));
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
index d1ff73e..dd3173b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
index 3131dd3..f332726 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
index 301d6f0..85000cc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
index 53a5b96..d56e13e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
@@ -39,9 +39,12 @@ public class AcceptParser {
private static final String REG_EX_QUALITY_FACTOR = "q=((?:1\\.0{0,3})|(?:0\\.[0-9]{0,2}[1-9]))";
private static final String REG_EX_OPTIONAL_WHITESPACE = "\\s?";
private static final Pattern REG_EX_ACCEPT = Pattern.compile("([a-z\\*]+/[a-z0-9\\+\\*\\-=;\\s]+)");
- private static final Pattern REG_EX_ACCEPT_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT + "(?:;" + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
- private static final Pattern REG_EX_ACCEPT_LANGUAGES = Pattern.compile("((?:(?:[a-z]{1,8})|(?:\\*))\\-?(?:[a-zA-Z]{1,8})?)");
- private static final Pattern REG_EX_ACCEPT_LANGUAGES_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT_LANGUAGES + "(?:;" + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
+ private static final Pattern REG_EX_ACCEPT_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT + "(?:;"
+ + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
+ private static final Pattern REG_EX_ACCEPT_LANGUAGES = Pattern
+ .compile("((?:(?:[a-z]{1,8})|(?:\\*))\\-?(?:[a-zA-Z]{1,8})?)");
+ private static final Pattern REG_EX_ACCEPT_LANGUAGES_WITH_Q_FACTOR = Pattern.compile(REG_EX_ACCEPT_LANGUAGES + "(?:;"
+ + REG_EX_OPTIONAL_WHITESPACE + REG_EX_QUALITY_FACTOR + ")?");
private static final double QUALITY_PARAM_FACTOR = 0.001;
@@ -116,7 +119,8 @@ public class AcceptParser {
} else {
String acceptLanguage = acceptLanguageScanner.next();
acceptLanguageScanner.close();
- throw new BatchException(BatchException.INVALID_ACCEPT_LANGUAGE_HEADER.addContent(acceptLanguage), BAD_REQUEST);
+ throw new BatchException(BatchException.INVALID_ACCEPT_LANGUAGE_HEADER.addContent(acceptLanguage),
+ BAD_REQUEST);
}
} else {
String acceptLanguage = acceptLanguageScanner.next();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
index 2db859c..2a0c1ce 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/a030e42b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
index 9546017..6adcf63 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
@@ -1,20 +1,20 @@
/*******************************************************************************
* 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
+ * 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
+ * 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.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
******************************************************************************/
package org.apache.olingo.odata2.core.batch;