Repository: olingo-odata4 Updated Branches: refs/heads/master fadb6c861 -> ae165feed
[OLINGO-575] Minor code clean up remove unused imports Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/ae165fee Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/ae165fee Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/ae165fee Branch: refs/heads/master Commit: ae165feedc320e1b5459102df17f2c7248449133 Parents: fadb6c8 Author: Michael Bolz <[email protected]> Authored: Tue Mar 10 11:05:36 2015 +0100 Committer: Michael Bolz <[email protected]> Committed: Tue Mar 10 11:10:48 2015 +0100 ---------------------------------------------------------------------- .../olingo/fit/utils/AbstractUtilities.java | 3 +-- .../fit/tecsvc/client/FunctionImportITCase.java | 26 -------------------- .../core/edm/EdmStructuredTypeHelperImpl.java | 2 -- .../http/ProxyWrappingHttpClientFactory.java | 3 +-- .../serialization/JsonEntitySetSerializer.java | 1 - .../olingo/server/api/batch/BatchFacade.java | 7 +++--- .../api/deserializer/batch/BatchOptions.java | 16 +++++------- .../olingo/server/api/edm/provider/Mapping.java | 7 +++--- .../server/api/processor/BatchProcessor.java | 2 +- 9 files changed, 15 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java ---------------------------------------------------------------------- diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java index ec86ac4..126a0b6 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java @@ -38,7 +38,6 @@ import java.util.regex.Pattern; import javax.ws.rs.NotFoundException; import javax.ws.rs.core.Response; -import javax.xml.stream.XMLStreamException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -131,7 +130,7 @@ public abstract class AbstractUtilities { * @param is * @return * @throws IOException - * @throws XMLStreamException + * @throws javax.xml.stream.XMLStreamException */ protected abstract Set<String> retrieveAllLinkNames(final InputStream is) throws Exception; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java ---------------------------------------------------------------------- diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java index 6dc904a..b2d5738 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java @@ -90,32 +90,6 @@ public class FunctionImportITCase extends AbstractBaseTestITCase { } -// @Test -// public void entityCollection22() { -// final ODataInvokeRequest<ODataEntitySet> request = getClient().getInvokeRequestFactory() -// .getFunctionInvokeRequest(getClient().newURIBuilder(TecSvcConst.BASE_URI) -// .appendOperationCallSegment("FICRTCollESTwoKeyNavParam").build(), ODataEntitySet.class, -// Collections.<String, ODataValue> singletonMap("ParameterInt16", -// getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2))); -// assertNotNull(request); -// -// final ODataInvokeResponse<ODataEntitySet> response = request.execute(); -// assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode()); -// -// final ODataEntitySet entitySet = response.getBody(); -// assertNotNull(entitySet); -// final List<ODataEntity> entities = entitySet.getEntities(); -// assertNotNull(entities); -// assertEquals(2, entities.size()); -// final ODataEntity entity = entities.get(1); -// assertNotNull(entity); -// final ODataProperty property = entity.getProperty("PropertyString"); -// assertNotNull(property); -// assertNotNull(property.getPrimitiveValue()); -// assertEquals("2", property.getPrimitiveValue().toValue()); -// } - - @Test public void countEntityCollection() throws Exception { final ODataRawRequest request = getClient().getRetrieveRequestFactory() http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java index e5bc5c9..b9ed216 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java @@ -21,8 +21,6 @@ package org.apache.olingo.client.core.edm; import java.util.LinkedHashMap; import java.util.Map; -import org.apache.olingo.client.api.edm.xml.ComplexType; -import org.apache.olingo.client.api.edm.xml.EntityType; import org.apache.olingo.client.api.edm.xml.NavigationProperty; import org.apache.olingo.client.api.edm.xml.Property; import org.apache.olingo.client.api.edm.xml.StructuralType; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrappingHttpClientFactory.java ---------------------------------------------------------------------- diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrappingHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrappingHttpClientFactory.java index 6b8aec2..e80567a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrappingHttpClientFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrappingHttpClientFactory.java @@ -26,13 +26,12 @@ import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.client.HttpClient; import org.apache.http.conn.params.ConnRoutePNames; import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.WrappingHttpClientFactory; import org.apache.olingo.commons.api.http.HttpMethod; /** * Implementation for working behind an HTTP proxy (possibly requiring authentication); requires another concrete - * {@link HttpClientFactory} implementation acting as real HTTP client factory. + * {@link org.apache.olingo.client.api.http.HttpClientFactory} implementation acting as real HTTP client factory. */ public class ProxyWrappingHttpClientFactory implements WrappingHttpClientFactory { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java ---------------------------------------------------------------------- diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java index 2a8e3e7..3c67055 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java @@ -19,7 +19,6 @@ package org.apache.olingo.commons.core.serialization; import java.io.IOException; -import java.net.URI; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java index 64d6a51..6a151e0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/batch/BatchFacade.java @@ -22,14 +22,13 @@ import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.batch.exception.BatchDeserializerException; import org.apache.olingo.server.api.deserializer.batch.BatchRequestPart; import org.apache.olingo.server.api.deserializer.batch.ODataResponsePart; -import org.apache.olingo.server.api.processor.BatchProcessor; /** * Provides methods to process {@link ODataRequest} and {@link BatchRequestPart}. * - * Within a {@link BatchProcessor} implementation BatchRequestsParts should be passed to - * {@link BatchFacade#handleBatchRequest(BatchRequestPart)}. If only if the BatchRequests part represents - * a change set, the request will be delegated to + * Within a {@link org.apache.olingo.server.api.processor.BatchProcessor} implementation BatchRequestsParts + * should be passed to {@link BatchFacade#handleBatchRequest(BatchRequestPart)}. + * If only if the BatchRequests part represents a change set, the request will be delegated to * {@link org.apache.olingo.server.api.processor.BatchProcessor#processChangeSet(BatchFacade, java.util.List)}. * Otherwise the requests will be directly executed. * http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java index e01d810..28309a5 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/deserializer/batch/BatchOptions.java @@ -18,14 +18,10 @@ */ package org.apache.olingo.server.api.deserializer.batch; -import java.io.InputStream; - -import org.apache.olingo.server.api.ODataRequest; -import org.apache.olingo.server.api.deserializer.FixedFormatDeserializer; - /** * Options for the batch deserializer. - * See {@link FixedFormatDeserializer#parseBatchRequest(InputStream, String, BatchOptions)} + * See {@link org.apache.olingo.server.api.deserializer.FixedFormatDeserializer + * #parseBatchRequest(java.io.InputStream, String, BatchOptions)} */ public class BatchOptions { private boolean isStrict = true; @@ -45,14 +41,14 @@ public class BatchOptions { } /** - * See {@link ODataRequest#getRawBaseUri()} + * See {@link org.apache.olingo.server.api.ODataRequest#getRawBaseUri()} */ public String getRawBaseUri() { return rawBaseUri; } /** - * See {@link ODataRequest#getRawServiceResolutionUri()} + * See {@link org.apache.olingo.server.api.ODataRequest#getRawServiceResolutionUri()} */ public String getRawServiceResolutionUri() { return rawServiceResolutionUri; @@ -87,7 +83,7 @@ public class BatchOptions { } /** - * See {@link ODataRequest#getRawBaseUri()} + * See {@link org.apache.olingo.server.api.ODataRequest#getRawBaseUri()} */ public Builder rawBaseUri(String baseUri) { options.rawBaseUri = baseUri; @@ -95,7 +91,7 @@ public class BatchOptions { } /** - * See {@link ODataRequest#getRawServiceResolutionUri()} + * See {@link org.apache.olingo.server.api.ODataRequest#getRawServiceResolutionUri()} */ public Builder rawServiceResolutionUri(String serviceResolutionUri) { options.rawServiceResolutionUri = serviceResolutionUri; http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Mapping.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Mapping.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Mapping.java index 823c29d..b6f4830 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Mapping.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Mapping.java @@ -19,7 +19,6 @@ package org.apache.olingo.server.api.edm.provider; import org.apache.olingo.commons.api.edm.EdmMapping; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; /** * Content of this class does not appear within the CSDL metadata document. This class is used to perform server @@ -30,9 +29,9 @@ public class Mapping implements EdmMapping { private Class<?> mappedJavaClass; /** - * Sets the class to be used during deserialization to transofrm an EDM primitive type into this java class. To see - * which classes work for which primitive type refer to {@link EdmPrimitiveType}. - * @param mappedJavaClass + * Sets the class to be used during deserialization to transform an EDM primitive type into this java class. To see + * which classes work for which primitive type refer to {@link org.apache.olingo.commons.api.edm.EdmPrimitiveType}. + * @param mappedJavaClass class to which is mapped * @return this for method chaining */ public Mapping setMappedJavaClass(Class<?> mappedJavaClass) { http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/ae165fee/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java index d0f828d..022f557 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/BatchProcessor.java @@ -37,7 +37,7 @@ public interface BatchProcessor extends Processor { * @param facade BatchFacade which should be used for further batch part handling * @param request OData request object containing raw HTTP information * @param response OData response object for collecting response data - * @throws BatchException if the service implementation encounters a failure + * @throws BatchSerializerException if the service implementation encounters a failure * @throws BatchDeserializerException if de-serialization failed */ void processBatch(BatchFacade facade, ODataRequest request, ODataResponse response)
