Repository: olingo-odata4 Updated Branches: refs/heads/master 3b9eb2fb8 -> ca4449f2b
[OLINGO-423] no '*' imports + minor documentation fix Change-Id: I5f7f5a5bcd73efb22de95ea4208f2f9be7739089 Signed-off-by: Michael Bolz <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/ca4449f2 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/ca4449f2 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/ca4449f2 Branch: refs/heads/master Commit: ca4449f2b28ae4d04cbb0565489d58d1d5fecec4 Parents: 3b9eb2f Author: Klaus Straubinger <[email protected]> Authored: Tue Oct 14 10:48:48 2014 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue Oct 14 10:52:59 2014 +0200 ---------------------------------------------------------------------- .../server/api/processor/DefaultProcessor.java | 11 +++--- .../apache/olingo/server/core/ODataHandler.java | 9 +++-- .../server/core/ODataHttpHandlerImpl.java | 9 +++-- .../xml/MetadataDocumentXmlSerializer.java | 38 +++++++++++++++----- .../server/core/ContentNegotiatorTest.java | 1 - .../olingo/server/tecsvc/TechnicalServlet.java | 1 - .../tecsvc/processor/TechnicalProcessor.java | 16 ++++++--- .../core/ODataHandlerExceptionHandlingTest.java | 6 +++- .../olingo/server/core/ODataHandlerTest.java | 5 ++- 9 files changed, 70 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/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 2e41175..3e02540 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 @@ -21,13 +21,17 @@ package org.apache.olingo.server.api.processor; import java.io.ByteArrayInputStream; import java.io.InputStream; -import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpStatusCode; -import org.apache.olingo.server.api.*; +import org.apache.olingo.server.api.OData; +import org.apache.olingo.server.api.ODataApplicationException; +import org.apache.olingo.server.api.ODataRequest; +import org.apache.olingo.server.api.ODataResponse; +import org.apache.olingo.server.api.ODataServerError; +import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.serializer.SerializerException; import org.apache.olingo.server.api.uri.UriInfo; @@ -64,7 +68,6 @@ public class DefaultProcessor implements MetadataProcessor, ServiceDocumentProce public void readMetadata(final ODataRequest request, final ODataResponse response, final UriInfo uriInfo, final ContentType requestedContentType) throws ODataApplicationException, SerializerException { ODataSerializer serializer = odata.createSerializer(ODataFormat.fromContentType(requestedContentType)); -// response.setContent(serializer.metadataDocument(serviceMetadata.getEdmMetadata())); response.setContent(serializer.metadataDocument(serviceMetadata)); response.setStatusCode(HttpStatusCode.OK.getStatusCode()); response.setHeader(HttpHeader.CONTENT_TYPE, requestedContentType.toContentTypeString()); @@ -74,7 +77,7 @@ public class DefaultProcessor implements MetadataProcessor, ServiceDocumentProce public void processException(ODataRequest request, ODataResponse response, ODataServerError serverError, ContentType requestedContentType) { try { - if(ContentType.APPLICATION_XML.equals(requestedContentType)){ + if (ContentType.APPLICATION_XML.equals(requestedContentType)) { requestedContentType = ODataFormat.JSON.getContentType(ODataServiceVersion.V40); } ODataSerializer serializer = odata.createSerializer(ODataFormat.fromContentType(requestedContentType)); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java index ac15d40..4ac780d 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java @@ -21,13 +21,18 @@ package org.apache.olingo.server.core; import java.util.HashMap; import java.util.Map; -import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.server.api.*; +import org.apache.olingo.server.api.OData; +import org.apache.olingo.server.api.ODataApplicationException; +import org.apache.olingo.server.api.ODataRequest; +import org.apache.olingo.server.api.ODataResponse; +import org.apache.olingo.server.api.ODataServerError; +import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.processor.DefaultProcessor; import org.apache.olingo.server.api.processor.EntitySetProcessor; import org.apache.olingo.server.api.processor.EntityProcessor; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java index 239cb94..bb31e26 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java @@ -30,10 +30,15 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.olingo.commons.api.ODataRuntimeException; -import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpMethod; -import org.apache.olingo.server.api.*; +import org.apache.olingo.server.api.OData; +import org.apache.olingo.server.api.ODataHttpHandler; +import org.apache.olingo.server.api.ODataRequest; +import org.apache.olingo.server.api.ODataResponse; +import org.apache.olingo.server.api.ODataServerError; +import org.apache.olingo.server.api.ODataTranslatedException; +import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.processor.Processor; import org.apache.olingo.server.api.serializer.SerializerException; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java index 7a9ad7e..9f81ef3 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java @@ -18,7 +18,30 @@ */ package org.apache.olingo.server.core.serializer.xml; -import org.apache.olingo.commons.api.edm.*; +import org.apache.olingo.commons.api.edm.EdmAction; +import org.apache.olingo.commons.api.edm.EdmActionImport; +import org.apache.olingo.commons.api.edm.EdmBindingTarget; +import org.apache.olingo.commons.api.edm.EdmComplexType; +import org.apache.olingo.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.commons.api.edm.EdmEntitySet; +import org.apache.olingo.commons.api.edm.EdmEntityType; +import org.apache.olingo.commons.api.edm.EdmEnumType; +import org.apache.olingo.commons.api.edm.EdmFunction; +import org.apache.olingo.commons.api.edm.EdmFunctionImport; +import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; +import org.apache.olingo.commons.api.edm.EdmNavigationProperty; +import org.apache.olingo.commons.api.edm.EdmNavigationPropertyBinding; +import org.apache.olingo.commons.api.edm.EdmOperation; +import org.apache.olingo.commons.api.edm.EdmParameter; +import org.apache.olingo.commons.api.edm.EdmProperty; +import org.apache.olingo.commons.api.edm.EdmReferentialConstraint; +import org.apache.olingo.commons.api.edm.EdmReturnType; +import org.apache.olingo.commons.api.edm.EdmSchema; +import org.apache.olingo.commons.api.edm.EdmSingleton; +import org.apache.olingo.commons.api.edm.EdmStructuredType; +import org.apache.olingo.commons.api.edm.EdmType; +import org.apache.olingo.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edmx.EdmxReference; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReferenceInclude; @@ -27,6 +50,7 @@ import org.apache.olingo.server.api.serializer.ODataSerializer; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; + import java.util.List; public class MetadataDocumentXmlSerializer { @@ -511,19 +535,15 @@ public class MetadataDocumentXmlSerializer { } private String getFullQualifiedName(final EdmType type, final boolean isCollection) { - if (isCollection) { - return "Collection(" + type.getNamespace() + "." + type.getName() + ")"; - } else { - return type.getNamespace() + "." + type.getName(); - } + final String name = type.getFullQualifiedName().getFullQualifiedNameAsString(); + return isCollection ? "Collection(" + name + ")" : name; } - /** Appends a reference to the OData Core Vocabulary as defined in the OData specification + /** Appends references, e.g., to the OData Core Vocabulary, as defined in the OData specification * and mentioned in its Common Schema Definition Language (CSDL) document. */ private void appendReference(final XMLStreamWriter writer) throws XMLStreamException { - List<EdmxReference> references = serviceMetadata.getReferences(); - for (EdmxReference reference: references) { + for (final EdmxReference reference : serviceMetadata.getReferences()) { writer.writeStartElement(PREFIX_EDMX, REFERENCE, NS_EDMX); writer.writeAttribute(URI, reference.getUri().toASCIIString()); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java index 5462327..0a958e2 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpMethod; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java index 27defff..f11bf41 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java @@ -34,7 +34,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import java.io.IOException; -import java.util.Collection; import java.util.Collections; import java.util.List; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java index 06eef4c..ca87c6b 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java @@ -20,14 +20,16 @@ package org.apache.olingo.server.tecsvc.processor; import java.io.ByteArrayInputStream; import java.io.UnsupportedEncodingException; -import java.util.*; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.ContextURL.Suffix; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; import org.apache.olingo.commons.api.data.Property; -import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; @@ -37,7 +39,11 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.http.HttpContentType; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpStatusCode; -import org.apache.olingo.server.api.*; +import org.apache.olingo.server.api.OData; +import org.apache.olingo.server.api.ODataApplicationException; +import org.apache.olingo.server.api.ODataRequest; +import org.apache.olingo.server.api.ODataResponse; +import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.processor.EntityProcessor; import org.apache.olingo.server.api.processor.EntitySetProcessor; import org.apache.olingo.server.api.processor.PropertyProcessor; @@ -209,7 +215,7 @@ public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor, .navOrPropertyPath(propertyPath) .build(); } - + private Map<String, String> mapKeys(List<UriParameter> parameters) throws ODataApplicationException { Map<String, String> keys = new LinkedHashMap<String, String>(); @@ -218,7 +224,7 @@ public class TechnicalProcessor implements EntitySetProcessor, EntityProcessor, } return keys; } - + @Override public void readProperty(final ODataRequest request, ODataResponse response, final UriInfo uriInfo, final ContentType contentType) throws ODataApplicationException, SerializerException { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerExceptionHandlingTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerExceptionHandlingTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerExceptionHandlingTest.java index c0c8f18..b7623b7 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerExceptionHandlingTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerExceptionHandlingTest.java @@ -32,7 +32,11 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.commons.api.http.HttpStatusCode; -import org.apache.olingo.server.api.*; +import org.apache.olingo.server.api.OData; +import org.apache.olingo.server.api.ODataApplicationException; +import org.apache.olingo.server.api.ODataRequest; +import org.apache.olingo.server.api.ODataResponse; +import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edm.provider.EdmProvider; import org.apache.olingo.server.api.edm.provider.EntitySet; import org.apache.olingo.server.api.edmx.EdmxReference; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ca4449f2/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java index b8c6553..d99c9ae 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java @@ -38,7 +38,10 @@ import org.apache.olingo.server.api.ODataRequest; import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.ServiceMetadata; import org.apache.olingo.server.api.edmx.EdmxReference; -import org.apache.olingo.server.api.processor.*; +import org.apache.olingo.server.api.processor.EntitySetProcessor; +import org.apache.olingo.server.api.processor.MetadataProcessor; +import org.apache.olingo.server.api.processor.PropertyProcessor; +import org.apache.olingo.server.api.processor.ServiceDocumentProcessor; import org.apache.olingo.server.api.uri.UriInfo; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Before;
