[OLINGO-564] Clean up

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()
+                                of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder()
-                                .buildInt16(
+                                        .buildInt16(
-                                    (short) 42)))
+                                                (short) 42)))
                         .add(
-                            of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim")
+                                of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim")
-                                .add(
+                                        .add(
-                                    of.newPrimitiveProperty("PropertyString", of
+                                                of.newPrimitiveProperty("PropertyString", of
-                                        .newPrimitiveValueBuilder()
+                                                        .newPrimitiveValueBuilder()
-                                        .buildString("42"))))))
+                                                        .buildString("42"))))))
                 .add(
                     of.newComplexValue("CTPrimComp")
                         .add(
-                            of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder()
+                                of.newPrimitiveProperty("PropertyInt16", of.newPrimitiveValueBuilder()
-                                .buildInt16(
+                                        .buildInt16(
-                                    (short) 43)))
+                                                (short) 43)))
                         .add(
-                            of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim")
+                                of.newComplexProperty("PropertyComp", of.newComplexValue("CTAllPrim")
-                                .add(
+                                        .add(
-                                    of.newPrimitiveProperty("PropertyString", of
+                                                of.newPrimitiveProperty("PropertyString", of
-                                        .newPrimitiveValueBuilder()
+                                                        .newPrimitiveValueBuilder()
-                                        .buildString("43"))))))));
+                                                        .buildString("43"))))))));
 
     final URI uri = getClient().newURIBuilder(SERVICE_URI)
         .appendEntitySetSegment("ESKeyNav")

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<ODataEntitySetIterator<ClientEntitySet, ClientEntity>> res = req.execute();
+    final ODataRetrieveResponse<ClientEntitySetIterator<ClientEntitySet, ClientEntity>> res = req.execute();
-    final ODataEntitySetIterator<ClientEntitySet, ClientEntity> feedIterator = res.getBody();
+    final ClientEntitySetIterator<ClientEntitySet, ClientEntity> feedIterator = res.getBody();
 
     assertNotNull(feedIterator);
 

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.ODataError;
-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.junit.Test;
 

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"));

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.

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<ES extends ClientEntitySet, E extends ClientEntity>
-        extends ODataRetrieveRequest<ODataEntitySetIterator<ES, E>> {
+        extends ODataRetrieveRequest<ClientEntitySetIterator<ES, E>> {
 //No additional methods needed for now.
 }

lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ClientEntitySetIterator.java

@@ -46,13 +46,13 @@ import org.slf4j.LoggerFactory;
  * @param <E> concrete ODataEntity implementation
  * @param <ES> concrete ODataEntitySet implementation
  */
-public class ODataEntitySetIterator<ES extends ClientEntitySet, E extends ClientEntity>
+public class ClientEntitySetIterator<ES extends ClientEntitySet, E extends ClientEntity>
         implements Iterator<E> {
 
   /**
    * 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<ES extends ClientEntitySet, E extends Client
    * @param stream source stream.
    * @param format OData format.
    */
-  public ODataEntitySetIterator(final ODataClient odataClient, final InputStream stream,
+  public ClientEntitySetIterator(final ODataClient odataClient, final InputStream stream,
-          final ODataFormat format) {
+                                 final ODataFormat format) {
 
     this.odataClient = odataClient;
     this.stream = stream;

lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataReader.java

@@ -24,7 +24,7 @@ import java.util.Map;
 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.commons.api.edm.Edm;

lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataErrorResponseChecker.java

@@ -25,7 +25,7 @@ import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.api.communication.ODataClientErrorException;
 import org.apache.olingo.client.api.communication.ODataServerErrorException;
 import org.apache.olingo.commons.api.ODataRuntimeException;
-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.slf4j.Logger;

lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java

@@ -25,7 +25,7 @@ import org.apache.http.client.HttpClient;
 import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest;
 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.domain.ClientEntity;
 import org.apache.olingo.client.api.domain.ClientEntitySet;
 import org.apache.olingo.commons.api.format.ODataFormat;
@@ -34,10 +34,10 @@ import org.apache.olingo.commons.api.format.ODataFormat;
  * This class implements an OData EntitySet query request.
  */
 public class ODataEntitySetIteratorRequestImpl<ES extends ClientEntitySet, E extends ClientEntity>
-        extends AbstractODataRetrieveRequest<ODataEntitySetIterator<ES, E>>
+        extends AbstractODataRetrieveRequest<ClientEntitySetIterator<ES, E>>
         implements ODataEntitySetIteratorRequest<ES, E> {
 
-  private ODataEntitySetIterator<ES, E> entitySetIterator = null;
+  private ClientEntitySetIterator<ES, E> entitySetIterator = null;
 
   /**
    * Private constructor.
@@ -55,7 +55,7 @@ public class ODataEntitySetIteratorRequestImpl<ES extends ClientEntitySet, E ext
   }
 
   @Override
-  public ODataRetrieveResponse<ODataEntitySetIterator<ES, E>> execute() {
+  public ODataRetrieveResponse<ClientEntitySetIterator<ES, E>> execute() {
     final HttpResponse res = doExecute();
     return new ODataEntitySetIteratorResponseImpl(odataClient, httpClient, res);
   }
@@ -72,9 +72,9 @@ public class ODataEntitySetIteratorRequestImpl<ES extends ClientEntitySet, E ext
     }
 
     @Override
-    public ODataEntitySetIterator<ES, E> getBody() {
+    public ClientEntitySetIterator<ES, E> getBody() {
       if (entitySetIterator == null) {
-        entitySetIterator = new ODataEntitySetIterator<ES, E>(
+        entitySetIterator = new ClientEntitySetIterator<ES, E>(
                 odataClient, getRawResponse(), ODataFormat.fromString(getContentType()));
       }
       return entitySetIterator;

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;

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<T> res;
 
     try {
-      if (ODataEntitySetIterator.class.isAssignableFrom(reference)) {
+      if (ClientEntitySetIterator.class.isAssignableFrom(reference)) {
         res = new ResWrap<T>(
             (URI) null,
             null,
-            reference.cast(new ODataEntitySetIterator<ClientEntitySet, ClientEntity>(
+            reference.cast(new ClientEntitySetIterator<ClientEntitySet, ClientEntity>(
                 client, src, ODataFormat.fromString(format))));
       } else if (ClientEntitySet.class.isAssignableFrom(reference)) {
         final ResWrap<EntityCollection> 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);
       }
     }

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;

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());
   }
 
   /**

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;

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 <tt>{ "error": {..., "details":[

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 {
 

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();
 }

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;
 

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
       }
     }
   }
-
 }

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.ODataError;
-import org.apache.olingo.commons.api.domain.ODataPropertyType;
+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;

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.ODataError;
-import org.apache.olingo.commons.api.domain.ODataPropertyType;
+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;

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.ODataError;
-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;

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;

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.ODataError;
-import org.apache.olingo.commons.api.domain.ODataErrorDetail;
+import org.apache.olingo.commons.api.ODataErrorDetail;
 
 /**
  * Server error.

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.ODataError;
-import org.apache.olingo.commons.api.domain.ODataErrorDetail;
+import org.apache.olingo.commons.api.ODataErrorDetail;
 import org.apache.olingo.server.api.serializer.SerializerException;
 
 import com.fasterxml.jackson.core.JsonGenerator;

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;