From 61500e685fca852fac301f473fcca8a2918f887e Mon Sep 17 00:00:00 2001 From: Michael Bolz Date: Thu, 30 Apr 2015 08:38:19 +0200 Subject: [PATCH] [OLINGO-564] Clean up --- .../olingo/fit/tecsvc/client/BasicITCase.java | 34 +++++++++---------- .../olingo/fit/v4/EntitySetTestITCase.java | 6 ++-- .../fit/v4/ErrorResponseTestITCase.java | 4 +-- .../olingo/fit/v4/MetadataTestITCase.java | 6 ++-- .../ODataClientErrorException.java | 2 +- .../ODataEntitySetIteratorRequest.java | 4 +-- ...ator.java => ClientEntitySetIterator.java} | 8 ++--- .../client/api/serialization/ODataReader.java | 2 +- .../header/ODataErrorResponseChecker.java | 2 +- .../ODataEntitySetIteratorRequestImpl.java | 12 +++---- .../ClientODataDeserializerImpl.java | 2 +- .../core/serialization/ODataReaderImpl.java | 10 +++--- .../olingo/client/core/v4/ErrorTest.java | 2 +- .../olingo/client/core/v4/MetadataTest.java | 2 +- .../commons/api/{domain => }/ODataError.java | 2 +- .../api/{domain => }/ODataErrorDetail.java | 2 +- .../api/{domain => }/ODataPropertyType.java | 2 +- .../EdmConstantAnnotationExpression.java | 1 + .../api/serialization/ODataDeserializer.java | 2 +- .../EdmConstantAnnotationExpressionImpl.java | 24 +++---------- .../core/serialization/AtomDeserializer.java | 4 +-- .../core/serialization/JsonDeserializer.java | 4 +-- .../JsonODataErrorDeserializer.java | 4 +-- .../JsonODataErrorDetailDeserializer.java | 2 +- .../olingo/server/api/ClientServerError.java | 4 +-- .../serializer/json/ODataErrorSerializer.java | 4 +-- .../json/ClientErrorSerializerTest.java | 2 +- 27 files changed, 71 insertions(+), 82 deletions(-) rename lib/client-api/src/main/java/org/apache/olingo/client/api/domain/{ODataEntitySetIterator.java => ClientEntitySetIterator.java} (96%) rename lib/commons-api/src/main/java/org/apache/olingo/commons/api/{domain => }/ODataError.java (98%) rename lib/commons-api/src/main/java/org/apache/olingo/commons/api/{domain => }/ODataErrorDetail.java (97%) rename lib/commons-api/src/main/java/org/apache/olingo/commons/api/{domain => }/ODataPropertyType.java (96%) diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java index 5463ffa9c..003dad413 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java @@ -57,7 +57,7 @@ import org.apache.olingo.client.api.domain.ClientAnnotation; import org.apache.olingo.client.api.domain.ClientComplexValue; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ODataError; +import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.client.api.domain.ClientInlineEntity; import org.apache.olingo.client.api.domain.ClientInlineEntitySet; import org.apache.olingo.client.api.domain.ClientObjectFactory; @@ -464,27 +464,27 @@ public class BasicITCase extends AbstractBaseTestITCase { .add( of.newComplexValue("CTPrimComp") .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() - .buildInt16( - (short) 42))) + of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() + .buildInt16( + (short) 42))) .add( - of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add( - of.newPrimitiveProperty("PropertyString", of - .newPrimitiveValueBuilder() - .buildString("42")))))) + of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add( + of.newPrimitiveProperty("PropertyString", of + .newPrimitiveValueBuilder() + .buildString("42")))))) .add( of.newComplexValue("CTPrimComp") .add( - of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() - .buildInt16( - (short) 43))) + of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder() + .buildInt16( + (short) 43))) .add( - of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") - .add( - of.newPrimitiveProperty("PropertyString", of - .newPrimitiveValueBuilder() - .buildString("43")))))))); + of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim") + .add( + of.newPrimitiveProperty("PropertyString", of + .newPrimitiveValueBuilder() + .buildString("43")))))))); final URI uri = getClient().newURIBuilder(SERVICE_URI) .appendEntitySetSegment("ESKeyNav") diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java index 3e001b0f1..9e9945751 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java @@ -24,7 +24,7 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntitySetIterator; +import org.apache.olingo.client.api.domain.ClientEntitySetIterator; import org.apache.olingo.client.api.uri.URIBuilder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.ResWrap; @@ -108,8 +108,8 @@ public class EntitySetTestITCase extends AbstractTestITCase { client.getRetrieveRequestFactory().getEntitySetIteratorRequest(uriBuilder.build()); req.setFormat(format); - final ODataRetrieveResponse> res = req.execute(); - final ODataEntitySetIterator feedIterator = res.getBody(); + final ODataRetrieveResponse> res = req.execute(); + final ClientEntitySetIterator feedIterator = res.getBody(); assertNotNull(feedIterator); diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java index 8cdd2dbae..0b47a9e04 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java @@ -19,8 +19,8 @@ package org.apache.olingo.fit.v4; import org.apache.olingo.client.api.communication.ODataClientErrorException; -import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.commons.api.domain.ODataErrorDetail; +import org.apache.olingo.commons.api.ODataError; +import org.apache.olingo.commons.api.ODataErrorDetail; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java index c5913940f..8ee9f2020 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java @@ -108,8 +108,10 @@ public class MetadataTestITCase extends AbstractTestITCase { final EdmAnnotation description = core.getAnnotation(descriptionTerm); assertNotNull(description); +// assertEquals("Core terms needed to write vocabularies", +// description.getExpression().asConstant().getValue().asPrimitive().toString()); assertEquals("Core terms needed to write vocabularies", - description.getExpression().asConstant().getValue().asPrimitive().toString()); + description.getExpression().asConstant().getValueAsString()); final EdmTerm isLanguageDependent = edm.getTerm(new FullQualifiedName("Core.IsLanguageDependent")); assertNotNull(isLanguageDependent); @@ -133,7 +135,7 @@ public class MetadataTestITCase extends AbstractTestITCase { final EdmAnnotation requiresTypeInScale = edm.getAnnotation( scale.getFullQualifiedName(), edm.getTerm(new FullQualifiedName("Core.RequiresType"))); assertNotNull(requiresTypeInScale); - assertEquals("Edm.Decimal", requiresTypeInScale.getExpression().asConstant().toString()); + assertEquals("Edm.Decimal", requiresTypeInScale.getExpression().asConstant().getValueAsString()); // 3. capabilities final EdmTerm deleteRestrictions = edm.getTerm(new FullQualifiedName("Capabilities.DeleteRestrictions")); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java index 178241a3b..64faf35d1 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/ODataClientErrorException.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.api.communication; import org.apache.commons.lang3.StringUtils; import org.apache.http.StatusLine; import org.apache.olingo.commons.api.ODataRuntimeException; -import org.apache.olingo.commons.api.domain.ODataError; +import org.apache.olingo.commons.api.ODataError; /** * Represents a client error in OData. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java index 4b3f05e38..d20eaca58 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetIteratorRequest.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataEntitySetIterator; +import org.apache.olingo.client.api.domain.ClientEntitySetIterator; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; @@ -26,6 +26,6 @@ import org.apache.olingo.client.api.domain.ClientEntitySet; * This class implements an OData EntitySet query request. */ public interface ODataEntitySetIteratorRequest - extends ODataRetrieveRequest> { + extends ODataRetrieveRequest> { //No additional methods needed for now. } diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java similarity index 96% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java rename to lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java index 64bf0f27c..accfce616 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySetIterator.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java @@ -46,13 +46,13 @@ import org.slf4j.LoggerFactory; * @param concrete ODataEntity implementation * @param concrete ODataEntitySet implementation */ -public class ODataEntitySetIterator +public class ClientEntitySetIterator implements Iterator { /** * Logger. */ - private static final Logger LOG = LoggerFactory.getLogger(ODataEntitySetIterator.class); + private static final Logger LOG = LoggerFactory.getLogger(ClientEntitySetIterator.class); protected final ODataClient odataClient; @@ -77,8 +77,8 @@ public class ODataEntitySetIterator - extends AbstractODataRetrieveRequest> + extends AbstractODataRetrieveRequest> implements ODataEntitySetIteratorRequest { - private ODataEntitySetIterator entitySetIterator = null; + private ClientEntitySetIterator entitySetIterator = null; /** * Private constructor. @@ -55,7 +55,7 @@ public class ODataEntitySetIteratorRequestImpl> execute() { + public ODataRetrieveResponse> execute() { final HttpResponse res = doExecute(); return new ODataEntitySetIteratorResponseImpl(odataClient, httpClient, res); } @@ -72,9 +72,9 @@ public class ODataEntitySetIteratorRequestImpl getBody() { + public ClientEntitySetIterator getBody() { if (entitySetIterator == null) { - entitySetIterator = new ODataEntitySetIterator( + entitySetIterator = new ClientEntitySetIterator( odataClient, getRawResponse(), ODataFormat.fromString(getContentType())); } return entitySetIterator; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java index a668aaf3a..92bd57b9a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ClientODataDeserializerImpl.java @@ -35,7 +35,7 @@ import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; -import org.apache.olingo.commons.api.domain.ODataError; +import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializer; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java index 8f3c8beff..6c97cdb2e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataReaderImpl.java @@ -25,7 +25,7 @@ import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.api.data.ServiceDocument; -import org.apache.olingo.client.api.domain.ODataEntitySetIterator; +import org.apache.olingo.client.api.domain.ClientEntitySetIterator; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.client.api.serialization.ODataReader; import org.apache.olingo.client.core.edm.ClientCsdlEdmProvider; @@ -35,7 +35,7 @@ import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.client.api.domain.ClientEntity; import org.apache.olingo.client.api.domain.ClientEntitySet; -import org.apache.olingo.commons.api.domain.ODataError; +import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.client.api.domain.ClientProperty; import org.apache.olingo.client.api.domain.ClientServiceDocument; import org.apache.olingo.client.api.domain.ClientValue; @@ -91,11 +91,11 @@ public class ODataReaderImpl implements ODataReader { ResWrap res; try { - if (ODataEntitySetIterator.class.isAssignableFrom(reference)) { + if (ClientEntitySetIterator.class.isAssignableFrom(reference)) { res = new ResWrap( (URI) null, null, - reference.cast(new ODataEntitySetIterator( + reference.cast(new ClientEntitySetIterator( client, src, ODataFormat.fromString(format)))); } else if (ClientEntitySet.class.isAssignableFrom(reference)) { final ResWrap resource = client.getDeserializer(ODataFormat.fromString(format)) @@ -149,7 +149,7 @@ public class ODataReaderImpl implements ODataReader { LOG.warn("Cast error", e); res = null; } finally { - if (!ODataEntitySetIterator.class.isAssignableFrom(reference)) { + if (!ClientEntitySetIterator.class.isAssignableFrom(reference)) { IOUtils.closeQuietly(src); } } diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java index c0067bcdb..057c0de1b 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.core.v4; import org.apache.olingo.client.api.ODataClient; import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.commons.api.domain.ODataError; +import org.apache.olingo.commons.api.ODataError; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java index e4778cb40..562a25534 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java @@ -273,7 +273,7 @@ public class MetadataTest extends AbstractTest { assertNotNull(weight); assertEquals(EdmInt32.getInstance(), weight.getUnderlyingType()); assertFalse(weight.getAnnotations().isEmpty()); - assertEquals("Kilograms", weight.getAnnotations().get(0).getExpression().asConstant().getValue().getValue()); + assertEquals("Kilograms", weight.getAnnotations().get(0).getExpression().asConstant().getValueAsString()); } /** diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java similarity index 98% rename from lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java index a910f0874..9ac0a8039 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataError.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.commons.api.domain; +package org.apache.olingo.commons.api; import java.util.List; import java.util.Map; diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataErrorDetail.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java similarity index 97% rename from lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataErrorDetail.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java index 573525db9..f8b1fa5de 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataErrorDetail.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataErrorDetail.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.commons.api.domain; +package org.apache.olingo.commons.api; /** * OData details， for example { "error": {..., "details":[ diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java similarity index 96% rename from lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java index e7b5b85c0..94c9fb0c7 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/ODataPropertyType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.commons.api.domain; +package org.apache.olingo.commons.api; public enum ODataPropertyType { diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/annotation/EdmConstantAnnotationExpression.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/annotation/EdmConstantAnnotationExpression.java index 0f0a34ff9..11fbe5fa5 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/annotation/EdmConstantAnnotationExpression.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/annotation/EdmConstantAnnotationExpression.java @@ -24,4 +24,5 @@ public interface EdmConstantAnnotationExpression extends EdmAnnotationExpression Valuable getValue(); + String getValueAsString(); } diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java index 8e313b105..21bcbe572 100755 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java @@ -22,7 +22,7 @@ import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntityCollection; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; -import org.apache.olingo.commons.api.domain.ODataError; +import org.apache.olingo.commons.api.ODataError; import java.io.InputStream; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java index 976359636..cc9f4fb6f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmConstantAnnotationExpressionImpl.java @@ -55,7 +55,7 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio for (Property enumValue : enumValues) { collValue.add(enumValue); } - value = new Property(enumTypeName, "name", ValueType.COLLECTION_ENUM, collValue); + value = new Property(enumTypeName, null, ValueType.COLLECTION_ENUM, collValue); } type = null; } else { @@ -95,27 +95,13 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio default: kind = EdmPrimitiveTypeKind.String; } -// final ClientPrimitiveValueImpl.BuilderImpl primitiveValueBuilder = new ClientPrimitiveValueImpl.BuilderImpl(); -// primitiveValueBuilder.setType(kind); -// try { -// final EdmPrimitiveType type = EdmPrimitiveTypeFactory.getInstance(kind); -// primitiveValueBuilder.setValue( -// type.valueOfString(constExprConstruct.getValue(), -// null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, -// type.getDefaultType())); -// } catch (final EdmPrimitiveTypeException e) { -// throw new IllegalArgumentException(e); -// } -// -// value = primitiveValueBuilder.build(); - type = EdmPrimitiveTypeFactory.getInstance(kind); try { - Object test = type.valueOfString(constExprConstruct.getValue(), + final Object valueOfString = type.valueOfString(constExprConstruct.getValue(), null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, type.getDefaultType()); value = new Property(kind.getFullQualifiedName().getFullQualifiedNameAsString(), - "name", ValueType.PRIMITIVE, test); + null, ValueType.PRIMITIVE, valueOfString); } catch (EdmPrimitiveTypeException e) { throw new IllegalArgumentException(e); } @@ -147,7 +133,8 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio return value; } - public String toString() { + @Override + public String getValueAsString() { if (value == null) { return ""; } else if(value.isEnum()) { @@ -164,5 +151,4 @@ public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotatio } } } - } diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java index 6b4b72ca2..f2faaa915 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java @@ -51,8 +51,8 @@ import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.data.Valuable; import org.apache.olingo.commons.api.data.ValueType; -import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.commons.api.domain.ODataPropertyType; +import org.apache.olingo.commons.api.ODataError; +import org.apache.olingo.commons.api.ODataPropertyType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java index 1047bdf76..2c13d35a2 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java @@ -43,8 +43,8 @@ import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.data.Valuable; import org.apache.olingo.commons.api.data.ValueType; -import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.commons.api.domain.ODataPropertyType; +import org.apache.olingo.commons.api.ODataError; +import org.apache.olingo.commons.api.ODataPropertyType; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java index 89252dca3..8679c6e0e 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java @@ -25,8 +25,8 @@ import java.util.Iterator; import java.util.List; import org.apache.olingo.commons.api.Constants; -import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.commons.api.domain.ODataErrorDetail; +import org.apache.olingo.commons.api.ODataError; +import org.apache.olingo.commons.api.ODataErrorDetail; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java index 138bad3c5..a4a5ec95a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java @@ -23,7 +23,7 @@ import java.net.URI; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.ResWrap; -import org.apache.olingo.commons.api.domain.ODataErrorDetail; +import org.apache.olingo.commons.api.ODataErrorDetail; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.JsonNode; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java index 6bbde228d..af918759f 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ClientServerError.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.commons.api.domain.ODataErrorDetail; +import org.apache.olingo.commons.api.ODataError; +import org.apache.olingo.commons.api.ODataErrorDetail; /** * Server error. diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java index 14381bbc0..70d636435 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java @@ -21,8 +21,8 @@ package org.apache.olingo.server.core.serializer.json; import java.io.IOException; import org.apache.olingo.commons.api.Constants; -import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.commons.api.domain.ODataErrorDetail; +import org.apache.olingo.commons.api.ODataError; +import org.apache.olingo.commons.api.ODataErrorDetail; import org.apache.olingo.server.api.serializer.SerializerException; import com.fasterxml.jackson.core.JsonGenerator; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java index adf0eb4b6..7c72e454e 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ClientErrorSerializerTest.java @@ -26,7 +26,7 @@ import java.util.ArrayList; import java.util.List; import org.apache.commons.io.IOUtils; -import org.apache.olingo.commons.api.domain.ODataErrorDetail; +import org.apache.olingo.commons.api.ODataErrorDetail; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ClientServerError;