From fdb1800372f93114b370a0dfd6404e460d47b008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= Date: Sun, 23 Mar 2014 15:33:29 +0100 Subject: [PATCH 1/7] [OLINGO-65] Removing any non type-based (de)serialization --- .../apache/olingo/client/api/Constants.java | 29 ++---- .../core/data/AtomGeoValueDeserializer.java | 12 ++- .../core/data/AtomGeoValueSerializer.java | 23 +++-- .../core/data/JSONGeoValueDeserializer.java | 14 ++- .../core/data/JSONGeoValueSerializer.java | 16 ++- .../core/domain/ODataPrimitiveValueImpl.java | 9 +- .../olingo/client/core/uri/URIUtils.java | 20 ++-- .../core/v3/AllGeoTypesSet_-10_Geom.xml | 13 ++- .../v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml | 43 +++++++- .../client/core/v3/AllGeoTypesSet_-5.xml | 97 ++++++++++--------- .../v3/AllGeoTypesSet_-5_GeogCollection.xml | 19 +++- .../core/v3/AllGeoTypesSet_-5_GeogPolygon.xml | 18 +++- .../v3/AllGeoTypesSet_-6_GeomMultiLine.xml | 24 ++++- .../v3/AllGeoTypesSet_-7_GeomMultiPoint.xml | 14 ++- .../client/core/v3/AllGeoTypesSet_-8.xml | 81 ++++++++-------- .../v3/AllGeoTypesSet_-8_GeomCollection.xml | 18 +++- 16 files changed, 302 insertions(+), 148 deletions(-) diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java index 7d9b4a272..6f94915e2 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java @@ -29,7 +29,9 @@ public class Constants { // Other stuff public final static String UTF8 = "UTF-8"; - public final static String NAME = "name"; + public final static Integer DEFAULT_PRECISION = 40; + + public final static Integer DEFAULT_SCALE = 25; // XML namespaces and prefixes public final static String NS_ATOM = "http://www.w3.org/2005/Atom"; @@ -38,32 +40,19 @@ public class Constants { public static final String NS_GML = "http://www.opengis.net/gml"; - public static final String XMLNS_DATASERVICES = XMLConstants.XMLNS_ATTRIBUTE + ":d"; - public static final String PREFIX_DATASERVICES = "d"; - public static final String XMLNS_METADATA = XMLConstants.XMLNS_ATTRIBUTE + ":m"; - public static final String PREFIX_METADATA = "m"; - public static final String XMLNS_GEORSS = XMLConstants.XMLNS_ATTRIBUTE + ":georss"; - public static final String PREFIX_GEORSS = "georss"; - public static final String XMLNS_GML = XMLConstants.XMLNS_ATTRIBUTE + ":gml"; - public static final String PREFIX_GML = "gml"; public final static String SRS_URLPREFIX = "http://www.opengis.net/def/crs/EPSG/0/"; - /** - * Edit link rel value. - */ + // Link rel(s) public static final String EDIT_LINK_REL = "edit"; - /** - * Self link rel value. - */ public static final String SELF_LINK_REL = "self"; public static final String NEXT_LINK_REL = "next"; @@ -75,12 +64,8 @@ public class Constants { public final static String ATTR_TYPE = "type"; - public static final String ATTR_M_TYPE = PREFIX_METADATA + ":" + ATTR_TYPE; - public final static String ATTR_NULL = "null"; - public static final String ATTR_M_NULL = PREFIX_METADATA + ":" + ATTR_NULL; - public static final String ATTR_XML_BASE = "base"; public static final QName QNAME_ATTR_XML_BASE = new QName(XMLConstants.XML_NS_URI, ATTR_XML_BASE); @@ -95,8 +80,6 @@ public class Constants { public static final String ATTR_TARGET = "target"; - public static final String ELEM_COLLECTION = "collection"; - public static final String ATTR_SRSNAME = "srsName"; public static final QName QNAME_ATTR_SRSNAME = new QName(NS_GML, ATTR_SRSNAME); @@ -143,8 +126,6 @@ public class Constants { public static final String ELEM_POS = "pos"; - public static final String ELEM_POSLIST = "posList"; - public static final String ELEM_PROPERTY = "property"; public static final String ELEM_LINKS = "links"; @@ -204,6 +185,8 @@ public class Constants { public final static String JSON_NEXT_LINK = "odata.nextLink"; + public final static String JSON_NAME = "name"; + // Atom stuff public final static String ATOM_ELEM_ENTRY = "entry"; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java index 20dd1646a..1187a8175 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java @@ -29,6 +29,7 @@ import javax.xml.stream.events.XMLEvent; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.GeoUtils; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.GeospatialCollection; @@ -38,6 +39,7 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint; import org.apache.olingo.commons.api.edm.geo.MultiPolygon; import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; +import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; class AtomGeoValueDeserializer { @@ -54,8 +56,14 @@ class AtomGeoValueDeserializer { final String[] pointInfo = event.asCharacters().getData().split(" "); final Point point = new Point(GeoUtils.getDimension(type), crs); - point.setX(Double.valueOf(pointInfo[0])); - point.setY(Double.valueOf(pointInfo[1])); + try { + point.setX(EdmDouble.getInstance().valueOfString(pointInfo[0], null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class)); + point.setY(EdmDouble.getInstance().valueOfString(pointInfo[1], null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class)); + } catch (EdmPrimitiveTypeException e) { + throw new XMLStreamException("While deserializing point coordinates as double", e); + } result.add(point); } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java index 78d87ba6b..02425b466 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java @@ -18,13 +18,12 @@ */ package org.apache.olingo.client.core.data; -import java.text.DecimalFormat; -import java.text.DecimalFormatSymbols; import java.util.Collections; import java.util.Iterator; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.GeospatialCollection; import org.apache.olingo.commons.api.edm.geo.LineString; @@ -33,18 +32,10 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint; import org.apache.olingo.commons.api.edm.geo.MultiPolygon; import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; +import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; class AtomGeoValueSerializer { - private static final ThreadLocal DOUBLE_FORMAT = new ThreadLocal() { - @Override - protected DecimalFormat initialValue() { - final DecimalFormatSymbols otherSymbols = new DecimalFormatSymbols(); - otherSymbols.setDecimalSeparator('.'); - return new DecimalFormat("#.#########################", otherSymbols); - } - }; - private void points(final XMLStreamWriter writer, final Iterator itor, final boolean wrap) throws XMLStreamException { @@ -56,7 +47,15 @@ class AtomGeoValueSerializer { } writer.writeStartElement(Constants.PREFIX_GML, Constants.ELEM_POS, Constants.NS_GML); - writer.writeCharacters(DOUBLE_FORMAT.get().format(point.getX()) + " " + DOUBLE_FORMAT.get().format(point.getY())); + try { + writer.writeCharacters(EdmDouble.getInstance().valueToString(point.getX(), null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + + " " + + EdmDouble.getInstance().valueToString(point.getY(), null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)); + } catch (EdmPrimitiveTypeException e) { + throw new XMLStreamException("While serializing point coordinates as double", e); + } writer.writeEndElement(); if (wrap) { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java index eebfef3bb..c58ff66e5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java @@ -26,6 +26,7 @@ import java.util.List; import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.GeoUtils; import org.apache.olingo.client.core.edm.EdmTypeInfo; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.edm.geo.Geospatial; @@ -36,6 +37,7 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint; import org.apache.olingo.commons.api.edm.geo.MultiPolygon; import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; +import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; class JSONGeoValueDeserializer { @@ -50,8 +52,14 @@ class JSONGeoValueDeserializer { if (itor.hasNext()) { point = new Point(GeoUtils.getDimension(type), crs); - point.setX(Double.valueOf(itor.next().asText())); - point.setY(Double.valueOf(itor.next().asText())); + try { + point.setX(EdmDouble.getInstance().valueOfString(itor.next().asText(), null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class)); + point.setY(EdmDouble.getInstance().valueOfString(itor.next().asText(), null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, Double.class)); + } catch (EdmPrimitiveTypeException e) { + throw new IllegalArgumentException("While deserializing point coordinates as double", e); + } } return point; @@ -217,7 +225,7 @@ class JSONGeoValueDeserializer { String crs = null; if (node.has(Constants.JSON_CRS)) { - crs = node.get(Constants.JSON_CRS).get(Constants.PROPERTIES).get(Constants.NAME).asText().split(":")[1]; + crs = node.get(Constants.JSON_CRS).get(Constants.PROPERTIES).get(Constants.JSON_NAME).asText().split(":")[1]; } Geospatial value = null; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java index 2e692ae06..4794b01e5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; import java.util.Iterator; import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.ComposedGeospatial; import org.apache.olingo.commons.api.edm.geo.Geospatial; @@ -32,21 +33,28 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint; import org.apache.olingo.commons.api.edm.geo.MultiPolygon; import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; +import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; class JSONGeoValueSerializer { private void crs(final JsonGenerator jgen, final String crs) throws IOException { jgen.writeObjectFieldStart(Constants.JSON_CRS); - jgen.writeStringField(Constants.ATTR_TYPE, Constants.NAME); + jgen.writeStringField(Constants.ATTR_TYPE, Constants.JSON_NAME); jgen.writeObjectFieldStart(Constants.PROPERTIES); - jgen.writeStringField(Constants.NAME, "EPSG:" + crs); + jgen.writeStringField(Constants.JSON_NAME, "EPSG:" + crs); jgen.writeEndObject(); jgen.writeEndObject(); } private void point(final JsonGenerator jgen, final Point point) throws IOException { - jgen.writeNumber(point.getX()); - jgen.writeNumber(point.getY()); + try { + jgen.writeNumber(EdmDouble.getInstance().valueToString(point.getX(), null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)); + jgen.writeNumber(EdmDouble.getInstance().valueToString(point.getY(), null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null)); + } catch (EdmPrimitiveTypeException e) { + throw new IllegalArgumentException("While serializing point coordinates as double", e); + } } private void multipoint(final JsonGenerator jgen, final MultiPoint multiPoint) throws IOException { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java index 4f191d86b..e6a040868 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java @@ -22,6 +22,7 @@ import java.sql.Timestamp; import java.util.Calendar; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; +import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.domain.AbstractODataValue; import org.apache.olingo.client.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; @@ -96,7 +97,8 @@ public class ODataPrimitiveValueImpl extends AbstractODataValue implements OData try { // TODO: when Edm is available, set facets when calling this method this.instance.value = this.instance.type.valueOfString( - this.instance.text, null, null, 40, 25, null, returnType); + this.instance.text, null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, + returnType); } catch (EdmPrimitiveTypeException e) { throw new IllegalArgumentException(e); } @@ -105,7 +107,7 @@ public class ODataPrimitiveValueImpl extends AbstractODataValue implements OData try { // TODO: when Edm is available, set facets when calling this method this.instance.text = this.instance.type.valueToString( - this.instance.value, null, null, 40, 25, null); + this.instance.value, null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null); } catch (EdmPrimitiveTypeException e) { throw new IllegalArgumentException(e); } @@ -153,7 +155,8 @@ public class ODataPrimitiveValueImpl extends AbstractODataValue implements OData @Override public T toCastValue(final Class reference) throws EdmPrimitiveTypeException { // TODO: when Edm is available, set facets when calling this method - return type.valueOfString(this.text, null, null, 40, 25, null, reference); + return type.valueOfString(this.text, null, null, Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null, + reference); } @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java index 50245ffe2..095f8ae5d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java @@ -25,7 +25,6 @@ import java.math.BigDecimal; import java.net.URI; import java.net.URLEncoder; import java.sql.Timestamp; -import java.text.DecimalFormat; import java.util.Calendar; import java.util.UUID; import javax.xml.datatype.Duration; @@ -38,6 +37,10 @@ import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTime; import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTimeOffset; +import org.apache.olingo.commons.core.edm.primitivetype.EdmDecimal; +import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; +import org.apache.olingo.commons.core.edm.primitivetype.EdmInt64; +import org.apache.olingo.commons.core.edm.primitivetype.EdmSingle; import org.apache.olingo.commons.core.edm.primitivetype.EdmTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -157,19 +160,22 @@ public final class URIUtils { valueToString(obj, null, null, null, null, null), Constants.UTF8) + "'" : (obj instanceof Calendar) ? "datetimeoffset'" + URLEncoder.encode(EdmDateTimeOffset.getInstance(). - valueToString(obj, null, null, null, null, null), Constants.UTF8) - + "'" + valueToString(obj, null, null, null, null, null), Constants.UTF8) + "'" : (obj instanceof Duration) ? "time'" + URLEncoder.encode(EdmTime.getInstance(). valueToString(obj, null, null, null, null, null), Constants.UTF8) + "'" : (obj instanceof BigDecimal) - ? new DecimalFormat("#.#######################").format((BigDecimal) obj) + "M" + ? EdmDecimal.getInstance().valueToString(obj, null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "M" : (obj instanceof Double) - ? new DecimalFormat("#.#######################E0").format((Double) obj) + "D" + ? EdmDouble.getInstance().valueToString(obj, null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "D" : (obj instanceof Float) - ? new DecimalFormat("#.#######E0").format((Float) obj) + "f" + ? EdmSingle.getInstance().valueToString(obj, null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "f" : (obj instanceof Long) - ? ((Long) obj).toString() + "L" + ? EdmInt64.getInstance().valueToString(obj, null, null, + Constants.DEFAULT_PRECISION, Constants.DEFAULT_SCALE, null) + "L" : (obj instanceof String) ? "'" + URLEncoder.encode((String) obj, Constants.UTF8) + "'" : obj.toString(); diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml index e103b35b9..50c16a219 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-10_Geom.xml @@ -19,4 +19,15 @@ under the License. --> -1 13 32 42 0 + + + 1.0 1.0 + 3.0 3.0 + 2.0 4.0 + 2.0 0.0 + + diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml index 7353d0ab9..f9e00cffb 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-3_GeomMultiPolygon.xml @@ -5,7 +5,7 @@ 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 + to you under the Apache License, Version 2.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -19,4 +19,43 @@ under the License. --> -40 4020 4545 3040 4020 3545 2030 510 1010 3020 3530 2020 2520 1530 20 + + + + + + + 40.0 40.0 + 20.0 45.0 + 45.0 30.0 + 40.0 40.0 + + + + + + + 20.0 35.0 + 45.0 20.0 + 30.0 5.0 + 10.0 10.0 + 10.0 30.0 + 20.0 35.0 + + + + + 30.0 20.0 + 20.0 25.0 + 20.0 15.0 + 30.0 20.0 + + + + + + diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml index 90037fd1a..738dcbf8c 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5.xml @@ -19,22 +19,27 @@ under the License. --> - + http://192.168.0.160:8080/DefaultService.svc/AllGeoTypesSet(-5) - - - + <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" + scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-5)"/> + <title/> <updated>2013-09-11T07:48:06Z</updated> <author> - <name /> + <name/> </author> <content type="application/xml"> <m:properties> <d:Id m:type="Edm.Int32">-5</d:Id> <d:Geog m:type="Edm.GeographyCollection"> - <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /> + <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/> </d:Geog> - <d:GeogPoint m:null="true" /> + <d:GeogPoint m:null="true"/> <d:GeogLine m:type="Edm.GeographyLineString"> <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> <gml:pos>10.5 10.5</gml:pos> @@ -46,11 +51,11 @@ <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> <gml:exterior> <gml:LinearRing> - <gml:pos>5 15</gml:pos> - <gml:pos>10 40</gml:pos> - <gml:pos>20 10</gml:pos> - <gml:pos>10 5</gml:pos> - <gml:pos>5 15</gml:pos> + <gml:pos>5.0 15.0</gml:pos> + <gml:pos>10.0 40.0</gml:pos> + <gml:pos>20.0 10.0</gml:pos> + <gml:pos>10.0 5.0</gml:pos> + <gml:pos>5.0 15.0</gml:pos> </gml:LinearRing> </gml:exterior> </gml:Polygon> @@ -58,11 +63,11 @@ <d:GeogCollection m:type="Edm.GeographyCollection"> <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> <gml:geometryMembers> - <gml:MultiGeometry /> + <gml:MultiGeometry/> <gml:MultiGeometry> <gml:geometryMembers> <gml:Point> - <gml:pos>2 1</gml:pos> + <gml:pos>2.0 1.0</gml:pos> </gml:Point> </gml:geometryMembers> </gml:MultiGeometry> @@ -79,7 +84,7 @@ </gml:MultiPoint> </d:GeogMultiPoint> <d:GeogMultiLine m:type="Edm.GeographyMultiLineString"> - <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /> + <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/> </d:GeogMultiLine> <d:GeogMultiPolygon m:type="Edm.GeographyMultiPolygon"> <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> @@ -87,30 +92,30 @@ <gml:Polygon> <gml:exterior> <gml:LinearRing> - <gml:pos>40 40</gml:pos> - <gml:pos>45 20</gml:pos> - <gml:pos>30 45</gml:pos> - <gml:pos>40 40</gml:pos> + <gml:pos>40.0 40.0</gml:pos> + <gml:pos>45.0 20.0</gml:pos> + <gml:pos>30.0 45.0</gml:pos> + <gml:pos>40.0 40.0</gml:pos> </gml:LinearRing> </gml:exterior> </gml:Polygon> <gml:Polygon> <gml:exterior> <gml:LinearRing> - <gml:pos>35 20</gml:pos> - <gml:pos>20 45</gml:pos> - <gml:pos>5 30</gml:pos> - <gml:pos>10 10</gml:pos> - <gml:pos>30 10</gml:pos> - <gml:pos>35 20</gml:pos> + <gml:pos>35.0 20.0</gml:pos> + <gml:pos>20.0 45.0</gml:pos> + <gml:pos>5.0 30.0</gml:pos> + <gml:pos>10.0 10.0</gml:pos> + <gml:pos>30.0 10.0</gml:pos> + <gml:pos>35.0 20.0</gml:pos> </gml:LinearRing> </gml:exterior> <gml:interior> <gml:LinearRing> - <gml:pos>20 30</gml:pos> - <gml:pos>25 20</gml:pos> - <gml:pos>15 20</gml:pos> - <gml:pos>20 30</gml:pos> + <gml:pos>20.0 30.0</gml:pos> + <gml:pos>25.0 20.0</gml:pos> + <gml:pos>15.0 20.0</gml:pos> + <gml:pos>20.0 30.0</gml:pos> </gml:LinearRing> </gml:interior> </gml:Polygon> @@ -118,7 +123,7 @@ </gml:MultiSurface> </d:GeogMultiPolygon> <d:Geom m:type="Edm.GeometryPolygon"> - <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /> + <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/> </d:Geom> <d:GeomPoint m:type="Edm.GeometryPoint"> <gml:Point gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> @@ -127,23 +132,23 @@ </d:GeomPoint> <d:GeomLine m:type="Edm.GeometryLineString"> <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> - <gml:pos>1 1</gml:pos> - <gml:pos>3 3</gml:pos> - <gml:pos>2 4</gml:pos> - <gml:pos>2 0</gml:pos> + <gml:pos>1.0 1.0</gml:pos> + <gml:pos>3.0 3.0</gml:pos> + <gml:pos>2.0 4.0</gml:pos> + <gml:pos>2.0 0.0</gml:pos> </gml:LineString> </d:GeomLine> <d:GeomPolygon m:type="Edm.GeometryPolygon"> - <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /> + <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/> </d:GeomPolygon> <d:GeomCollection m:type="Edm.GeometryCollection"> <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> <gml:geometryMembers> - <gml:MultiGeometry /> + <gml:MultiGeometry/> <gml:MultiGeometry> <gml:geometryMembers> <gml:Point> - <gml:pos>1 2</gml:pos> + <gml:pos>1.0 2.0</gml:pos> </gml:Point> </gml:geometryMembers> </gml:MultiGeometry> @@ -151,26 +156,26 @@ </gml:MultiGeometry> </d:GeomCollection> <d:GeomMultiPoint m:type="Edm.GeometryMultiPoint"> - <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /> + <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/> </d:GeomMultiPoint> <d:GeomMultiLine m:type="Edm.GeometryMultiLineString"> <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> <gml:curveMembers> <gml:LineString> - <gml:pos>10 10</gml:pos> - <gml:pos>20 20</gml:pos> - <gml:pos>10 40</gml:pos> + <gml:pos>10.0 10.0</gml:pos> + <gml:pos>20.0 20.0</gml:pos> + <gml:pos>10.0 40.0</gml:pos> </gml:LineString> <gml:LineString> - <gml:pos>40 40</gml:pos> - <gml:pos>30 30</gml:pos> - <gml:pos>40 20</gml:pos> - <gml:pos>30 10</gml:pos> + <gml:pos>40.0 40.0</gml:pos> + <gml:pos>30.0 30.0</gml:pos> + <gml:pos>40.0 20.0</gml:pos> + <gml:pos>30.0 10.0</gml:pos> </gml:LineString> </gml:curveMembers> </gml:MultiCurve> </d:GeomMultiLine> - <d:GeomMultiPolygon m:null="true" /> + <d:GeomMultiPolygon m:null="true"/> </m:properties> </content> </entry> diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml index a13a98d46..5e1eaa231 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogCollection.xml @@ -19,4 +19,21 @@ under the License. --> -<d:GeogCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:geometryMembers><gml:MultiGeometry /><gml:MultiGeometry><gml:geometryMembers><gml:Point><gml:pos>2 1</gml:pos></gml:Point></gml:geometryMembers></gml:MultiGeometry></gml:geometryMembers></gml:MultiGeometry></d:GeogCollection> +<d:GeogCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" + xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" + xmlns:georss="http://www.georss.org/georss" + xmlns:gml="http://www.opengis.net/gml" + m:type="Edm.GeographyCollection"> + <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> + <gml:geometryMembers> + <gml:MultiGeometry /> + <gml:MultiGeometry> + <gml:geometryMembers> + <gml:Point> + <gml:pos>2.0 1.0</gml:pos> + </gml:Point> + </gml:geometryMembers> + </gml:MultiGeometry> + </gml:geometryMembers> + </gml:MultiGeometry> +</d:GeogCollection> diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml index 766d2c859..947f48f38 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-5_GeogPolygon.xml @@ -19,4 +19,20 @@ under the License. --> -<d:GeogPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeographyPolygon"><gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"><gml:exterior><gml:LinearRing><gml:pos>5 15</gml:pos><gml:pos>10 40</gml:pos><gml:pos>20 10</gml:pos><gml:pos>10 5</gml:pos><gml:pos>5 15</gml:pos></gml:LinearRing></gml:exterior></gml:Polygon></d:GeogPolygon> +<d:GeogPolygon xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" + xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" + xmlns:georss="http://www.georss.org/georss" + xmlns:gml="http://www.opengis.net/gml" + m:type="Edm.GeographyPolygon"> + <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> + <gml:exterior> + <gml:LinearRing> + <gml:pos>5.0 15.0</gml:pos> + <gml:pos>10.0 40.0</gml:pos> + <gml:pos>20.0 10.0</gml:pos> + <gml:pos>10.0 5.0</gml:pos> + <gml:pos>5.0 15.0</gml:pos> + </gml:LinearRing> + </gml:exterior> + </gml:Polygon> +</d:GeogPolygon> diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml index dbaf3adba..847eb028f 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-6_GeomMultiLine.xml @@ -5,7 +5,7 @@ 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 + to you under the Apache License, Version 2.0.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at @@ -19,4 +19,24 @@ under the License. --> -<d:GeomMultiLine xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiLineString"><gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:curveMembers><gml:LineString><gml:pos>10 10</gml:pos><gml:pos>20 20</gml:pos><gml:pos>10 40</gml:pos></gml:LineString><gml:LineString><gml:pos>40 40</gml:pos><gml:pos>30 30</gml:pos><gml:pos>40 20</gml:pos><gml:pos>30 10</gml:pos></gml:LineString></gml:curveMembers></gml:MultiCurve></d:GeomMultiLine> +<d:GeomMultiLine xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" + xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" + xmlns:georss="http://www.georss.org/georss" + xmlns:gml="http://www.opengis.net/gml" + m:type="Edm.GeometryMultiLineString"> + <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> + <gml:curveMembers> + <gml:LineString> + <gml:pos>10.0 10.0</gml:pos> + <gml:pos>20.0 20.0</gml:pos> + <gml:pos>10.0 40.0</gml:pos> + </gml:LineString> + <gml:LineString> + <gml:pos>40.0 40.0</gml:pos> + <gml:pos>30.0 30.0</gml:pos> + <gml:pos>40.0 20.0</gml:pos> + <gml:pos>30.0 10.0</gml:pos> + </gml:LineString> + </gml:curveMembers> + </gml:MultiCurve> +</d:GeomMultiLine> diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml index f7b1dfb99..5aac3b97f 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-7_GeomMultiPoint.xml @@ -19,4 +19,16 @@ under the License. --> -<d:GeomMultiPoint xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryMultiPoint"><gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:pointMembers><gml:Point><gml:pos>0 0</gml:pos></gml:Point></gml:pointMembers></gml:MultiPoint></d:GeomMultiPoint> +<d:GeomMultiPoint xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" + xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" + xmlns:georss="http://www.georss.org/georss" + xmlns:gml="http://www.opengis.net/gml" + m:type="Edm.GeometryMultiPoint"> + <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> + <gml:pointMembers> + <gml:Point> + <gml:pos>0.0 0.0</gml:pos> + </gml:Point> + </gml:pointMembers> + </gml:MultiPoint> +</d:GeomMultiPoint> diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml index 2d1ce3c6a..a5bf4eb49 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8.xml @@ -20,16 +20,19 @@ --> <entry xml:base="http://192.168.43.55:8080/DefaultService.svc/" - xmlns="http://www.w3.org/2005/Atom" xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" + xmlns="http://www.w3.org/2005/Atom" + xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" - xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml"> + xmlns:georss="http://www.georss.org/georss" + xmlns:gml="http://www.opengis.net/gml"> <id>http://192.168.43.55:8080/DefaultService.svc/AllGeoTypesSet(-8)</id> - <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme" /> - <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)" /> - <title /> + <category term="Microsoft.Test.OData.Services.AstoriaDefaultService.AllSpatialTypes" + scheme="http://schemas.microsoft.com/ado/2007/08/dataservices/scheme"/> + <link rel="edit" title="AllSpatialTypes" href="AllGeoTypesSet(-8)"/> + <title/> <updated>2013-08-21T10:50:04Z</updated> <author> - <name /> + <name/> </author> <content type="application/xml"> <m:properties> @@ -46,16 +49,16 @@ </d:GeogPoint> <d:GeogLine m:type="Edm.GeographyLineString"> <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> - <gml:pos>10 10</gml:pos> - <gml:pos>20 20</gml:pos> - <gml:pos>40 10</gml:pos> + <gml:pos>10.0 10.0</gml:pos> + <gml:pos>20.0 20.0</gml:pos> + <gml:pos>40.0 10.0</gml:pos> </gml:LineString> </d:GeogLine> <d:GeogPolygon m:type="Edm.GeographyPolygon"> - <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /> + <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/> </d:GeogPolygon> <d:GeogCollection m:type="Edm.GeographyCollection"> - <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326" /> + <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"/> </d:GeogCollection> <d:GeogMultiPoint m:type="Edm.GeographyMultiPoint"> <gml:MultiPoint gml:srsName="http://www.opengis.net/def/crs/EPSG/0/4326"> @@ -89,30 +92,30 @@ <gml:Polygon> <gml:exterior> <gml:LinearRing> - <gml:pos>40 40</gml:pos> - <gml:pos>45 20</gml:pos> - <gml:pos>30 45</gml:pos> - <gml:pos>40 40</gml:pos> + <gml:pos>40.0 40.0</gml:pos> + <gml:pos>45.0 20.0</gml:pos> + <gml:pos>30.0 45.0</gml:pos> + <gml:pos>40.0 40.0</gml:pos> </gml:LinearRing> </gml:exterior> </gml:Polygon> <gml:Polygon> <gml:exterior> <gml:LinearRing> - <gml:pos>35 20</gml:pos> - <gml:pos>20 45</gml:pos> - <gml:pos>5 30</gml:pos> - <gml:pos>10 10</gml:pos> - <gml:pos>30 10</gml:pos> - <gml:pos>35 20</gml:pos> + <gml:pos>35.0 20.0</gml:pos> + <gml:pos>20.0 45.0</gml:pos> + <gml:pos>5.0 30.0</gml:pos> + <gml:pos>10.0 10.0</gml:pos> + <gml:pos>30.0 10.0</gml:pos> + <gml:pos>35.0 20.0</gml:pos> </gml:LinearRing> </gml:exterior> <gml:interior> <gml:LinearRing> - <gml:pos>20 30</gml:pos> - <gml:pos>25 20</gml:pos> - <gml:pos>15 20</gml:pos> - <gml:pos>20 30</gml:pos> + <gml:pos>20.0 30.0</gml:pos> + <gml:pos>25.0 20.0</gml:pos> + <gml:pos>15.0 20.0</gml:pos> + <gml:pos>20.0 30.0</gml:pos> </gml:LinearRing> </gml:interior> </gml:Polygon> @@ -131,20 +134,20 @@ </d:GeomPoint> <d:GeomLine m:type="Edm.GeometryLineString"> <gml:LineString gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> - <gml:pos>1 1</gml:pos> - <gml:pos>3 3</gml:pos> - <gml:pos>2 4</gml:pos> - <gml:pos>2 0</gml:pos> + <gml:pos>1.0 1.0</gml:pos> + <gml:pos>3.0 3.0</gml:pos> + <gml:pos>2.0 4.0</gml:pos> + <gml:pos>2.0 0.0</gml:pos> </gml:LineString> </d:GeomLine> <d:GeomPolygon m:type="Edm.GeometryPolygon"> <gml:Polygon gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> <gml:exterior> <gml:LinearRing> - <gml:pos>30 20</gml:pos> - <gml:pos>10 40</gml:pos> - <gml:pos>45 40</gml:pos> - <gml:pos>30 20</gml:pos> + <gml:pos>30.0 20.0</gml:pos> + <gml:pos>10.0 40.0</gml:pos> + <gml:pos>45.0 40.0</gml:pos> + <gml:pos>30.0 20.0</gml:pos> </gml:LinearRing> </gml:exterior> </gml:Polygon> @@ -153,21 +156,21 @@ <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> <gml:geometryMembers> <gml:Point> - <gml:pos>4 6</gml:pos> + <gml:pos>4.0 6.0</gml:pos> </gml:Point> <gml:LineString> - <gml:pos>4 6</gml:pos> - <gml:pos>7 10</gml:pos> + <gml:pos>4.0 6.0</gml:pos> + <gml:pos>7.0 10.0</gml:pos> </gml:LineString> </gml:geometryMembers> </gml:MultiGeometry> </d:GeomCollection> - <d:GeomMultiPoint m:null="true" /> + <d:GeomMultiPoint m:null="true"/> <d:GeomMultiLine m:type="Edm.GeometryMultiLineString"> - <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /> + <gml:MultiCurve gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/> </d:GeomMultiLine> <d:GeomMultiPolygon m:type="Edm.GeometryMultiPolygon"> - <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0" /> + <gml:MultiSurface gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"/> </d:GeomMultiPolygon> </m:properties> </content> diff --git a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml index d1374bd18..130f8be4a 100644 --- a/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml +++ b/lib/client-core/src/test/resources/org/apache/olingo/client/core/v3/AllGeoTypesSet_-8_GeomCollection.xml @@ -19,4 +19,20 @@ under the License. --> -<d:GeomCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" xmlns:georss="http://www.georss.org/georss" xmlns:gml="http://www.opengis.net/gml" m:type="Edm.GeometryCollection"><gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"><gml:geometryMembers><gml:Point><gml:pos>4 6</gml:pos></gml:Point><gml:LineString><gml:pos>4 6</gml:pos><gml:pos>7 10</gml:pos></gml:LineString></gml:geometryMembers></gml:MultiGeometry></d:GeomCollection> +<d:GeomCollection xmlns:d="http://schemas.microsoft.com/ado/2007/08/dataservices" + xmlns:m="http://schemas.microsoft.com/ado/2007/08/dataservices/metadata" + xmlns:georss="http://www.georss.org/georss" + xmlns:gml="http://www.opengis.net/gml" + m:type="Edm.GeometryCollection"> + <gml:MultiGeometry gml:srsName="http://www.opengis.net/def/crs/EPSG/0/0"> + <gml:geometryMembers> + <gml:Point> + <gml:pos>4.0 6.0</gml:pos> + </gml:Point> + <gml:LineString> + <gml:pos>4.0 6.0</gml:pos> + <gml:pos>7.0 10.0</gml:pos> + </gml:LineString> + </gml:geometryMembers> + </gml:MultiGeometry> +</d:GeomCollection> From c876e670763bd21adda3086710db130c0041f135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org> Date: Sun, 23 Mar 2014 16:39:40 +0100 Subject: [PATCH 2/7] Package rename --- .../org/apache/olingo/client/core/AbstractODataClient.java | 4 ++-- .../olingo/client/core/edm/xml/AbstractComplexType.java | 2 +- .../olingo/client/core/edm/xml/AbstractEntityContainer.java | 2 +- .../apache/olingo/client/core/edm/xml/AbstractEntitySet.java | 2 +- .../apache/olingo/client/core/edm/xml/AbstractEntityType.java | 2 +- .../apache/olingo/client/core/edm/xml/AbstractEnumType.java | 2 +- .../org/apache/olingo/client/core/edm/xml/AbstractSchema.java | 2 +- .../olingo/client/core/edm/xml/DataServicesDeserializer.java | 2 +- .../apache/olingo/client/core/edm/xml/EdmxDeserializer.java | 2 +- .../org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java | 2 +- .../olingo/client/core/edm/xml/ParameterDeserializer.java | 2 +- .../olingo/client/core/edm/xml/PropertyDeserializer.java | 2 +- .../client/core/edm/xml/v3/AnnotationsDeserializer.java | 2 +- .../client/core/edm/xml/v3/AssociationDeserializer.java | 2 +- .../client/core/edm/xml/v3/AssociationSetDeserializer.java | 2 +- .../client/core/edm/xml/v3/FunctionImportDeserializer.java | 2 +- .../edm/xml/v3/ReferentialConstraintRoleDeserializer.java | 2 +- .../client/core/edm/xml/v3/TypeAnnotationDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/ActionDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/AnnotationDeserializer.java | 2 +- .../client/core/edm/xml/v4/AnnotationsDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/FunctionDeserializer.java | 2 +- .../core/edm/xml/v4/NavigationPropertyDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/ReferenceDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/SingletonDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/TermDeserializer.java | 2 +- .../client/core/edm/xml/v4/TypeDefinitionDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/ApplyDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/CastDeserializer.java | 2 +- .../core/edm/xml/v4/annotation/CollectionDeserializer.java | 2 +- .../edm/xml/v4/annotation/DynExprConstructDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/IsOfDeserializer.java | 2 +- .../edm/xml/v4/annotation/LabeledElementDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/NullDeserializer.java | 2 +- .../core/edm/xml/v4/annotation/PropertyValueDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/RecordDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/UrlRefDeserializer.java | 2 +- .../client/core/op/{impl => }/AbstractEdmDeserializer.java | 2 +- .../olingo/client/core/op/{impl => }/AbstractJacksonTool.java | 2 +- .../olingo/client/core/op/{impl => }/AbstractODataBinder.java | 2 +- .../client/core/op/{impl => }/AbstractODataDeserializer.java | 2 +- .../olingo/client/core/op/{impl => }/AbstractODataReader.java | 2 +- .../client/core/op/{impl => }/AbstractODataSerializer.java | 2 +- .../client/core/op/{impl => }/ComplexTypeDeserializer.java | 2 +- .../core/op/{impl => }/EntityContainerDeserializer.java | 2 +- .../client/core/op/{impl => }/EntityKeyDeserializer.java | 2 +- .../client/core/op/{impl => }/EntitySetDeserializer.java | 2 +- .../client/core/op/{impl => }/EntityTypeDeserializer.java | 2 +- .../client/core/op/{impl => }/EnumTypeDeserializer.java | 2 +- .../core/op/{impl => }/InjectableSerializerProvider.java | 2 +- .../client/core/op/{impl => }/ODataObjectFactoryImpl.java | 2 +- .../olingo/client/core/op/{impl => }/ODataWriterImpl.java | 2 +- .../olingo/client/core/op/{impl => }/ResourceFactory.java | 2 +- .../olingo/client/core/op/{impl => }/SchemaDeserializer.java | 2 +- .../apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java | 2 +- .../olingo/client/core/op/impl/v3/ODataDeserializerImpl.java | 2 +- .../apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java | 2 +- .../olingo/client/core/op/impl/v3/ODataSerializerImpl.java | 2 +- .../apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java | 2 +- .../olingo/client/core/op/impl/v4/ODataDeserializerImpl.java | 2 +- .../apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java | 2 +- .../olingo/client/core/op/impl/v4/ODataSerializerImpl.java | 2 +- .../olingo/client/core/it/v3/EntityRetrieveTestITCase.java | 2 +- .../apache/olingo/client/core/it/v3/EntitySetTestITCase.java | 2 +- .../java/org/apache/olingo/client/core/v3/EntitySetTest.java | 2 +- .../java/org/apache/olingo/client/core/v3/EntityTest.java | 2 +- 67 files changed, 68 insertions(+), 68 deletions(-) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/AbstractEdmDeserializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/AbstractJacksonTool.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/AbstractODataBinder.java (99%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/AbstractODataDeserializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/AbstractODataReader.java (99%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/AbstractODataSerializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/ComplexTypeDeserializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/EntityContainerDeserializer.java (99%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/EntityKeyDeserializer.java (97%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/EntitySetDeserializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/EntityTypeDeserializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/EnumTypeDeserializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/InjectableSerializerProvider.java (97%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/ODataObjectFactoryImpl.java (99%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/ODataWriterImpl.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/ResourceFactory.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/op/{impl => }/SchemaDeserializer.java (99%) diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java index 2ecd92c99..b5cfdeabc 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java @@ -23,8 +23,8 @@ import org.apache.olingo.client.api.domain.ODataObjectFactory; import org.apache.olingo.client.api.op.ODataWriter; import org.apache.olingo.client.core.domain.ODataGeospatialValueImpl; import org.apache.olingo.client.core.domain.ODataPrimitiveValueImpl; -import org.apache.olingo.client.core.op.impl.ODataObjectFactoryImpl; -import org.apache.olingo.client.core.op.impl.ODataWriterImpl; +import org.apache.olingo.client.core.op.ODataObjectFactoryImpl; +import org.apache.olingo.client.core.op.ODataWriterImpl; public abstract class AbstractODataClient implements CommonODataClient { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java index 30d214256..0630a59b7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty; import org.apache.olingo.client.api.edm.xml.CommonProperty; import org.apache.olingo.client.api.edm.xml.ComplexType; -import org.apache.olingo.client.core.op.impl.ComplexTypeDeserializer; +import org.apache.olingo.client.core.op.ComplexTypeDeserializer; @JsonDeserialize(using = ComplexTypeDeserializer.class) public abstract class AbstractComplexType extends AbstractEdmItem implements ComplexType { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java index ade3a6b57..c15266eaf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.olingo.client.api.edm.xml.CommonFunctionImport; import org.apache.olingo.client.api.edm.xml.EntityContainer; import org.apache.olingo.client.api.edm.xml.EntitySet; -import org.apache.olingo.client.core.op.impl.EntityContainerDeserializer; +import org.apache.olingo.client.core.op.EntityContainerDeserializer; @JsonDeserialize(using = EntityContainerDeserializer.class) public abstract class AbstractEntityContainer extends AbstractEdmItem implements EntityContainer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java index 722610afd..65650f338 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.EntitySet; -import org.apache.olingo.client.core.op.impl.EntitySetDeserializer; +import org.apache.olingo.client.core.op.EntitySetDeserializer; @JsonDeserialize(using = EntitySetDeserializer.class) public abstract class AbstractEntitySet extends AbstractEdmItem implements EntitySet { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java index d30e124af..e375323ba 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java @@ -22,7 +22,7 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.EntityKey; import org.apache.olingo.client.api.edm.xml.EntityType; -import org.apache.olingo.client.core.op.impl.EntityTypeDeserializer; +import org.apache.olingo.client.core.op.EntityTypeDeserializer; @JsonDeserialize(using = EntityTypeDeserializer.class) public abstract class AbstractEntityType extends AbstractComplexType implements EntityType { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java index 2afa7943e..3730fad15 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.olingo.client.api.edm.xml.EnumType; import org.apache.olingo.client.api.edm.xml.Member; -import org.apache.olingo.client.core.op.impl.EnumTypeDeserializer; +import org.apache.olingo.client.core.op.EnumTypeDeserializer; @JsonDeserialize(using = EnumTypeDeserializer.class) public abstract class AbstractEnumType extends AbstractEdmItem implements EnumType { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java index b099c3185..6cc2915fc 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java @@ -24,7 +24,7 @@ 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.EnumType; import org.apache.olingo.client.api.edm.xml.Schema; -import org.apache.olingo.client.core.op.impl.SchemaDeserializer; +import org.apache.olingo.client.core.op.SchemaDeserializer; @JsonDeserialize(using = SchemaDeserializer.class) public abstract class AbstractSchema extends AbstractEdmItem implements Schema { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java index a7ded8a9c..94ec6bbde 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.core.edm.xml; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import com.fasterxml.jackson.core.JsonParser; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java index 796624be6..a3041f0b5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core.edm.xml; import org.apache.olingo.client.core.edm.xml.v4.ReferenceImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import com.fasterxml.jackson.core.JsonParser; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java index 9880a3ac1..8074e6929 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java @@ -25,7 +25,7 @@ import java.util.List; import org.apache.olingo.client.api.edm.xml.EntityKey; import org.apache.olingo.client.api.edm.xml.PropertyRef; -import org.apache.olingo.client.core.op.impl.EntityKeyDeserializer; +import org.apache.olingo.client.core.op.EntityKeyDeserializer; @JsonDeserialize(using = EntityKeyDeserializer.class) public class EntityKeyImpl extends AbstractEdmItem implements EntityKey { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java index 2587bcefa..cb0178dd2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java @@ -27,7 +27,7 @@ import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; import org.apache.olingo.client.api.edm.xml.v3.ParameterMode; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ParameterDeserializer extends AbstractEdmDeserializer<AbstractParameter> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java index 6e874b442..ec4074617 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java @@ -24,7 +24,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.client.api.edm.StoreGeneratedPattern; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java index 4fec055c5..b1e762411 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java index 6d999c290..7031453a6 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class AssociationDeserializer extends AbstractEdmDeserializer<AssociationImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java index 4b04aa0dd..1f74893cf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class AssociationSetDeserializer extends AbstractEdmDeserializer<AssociationSetImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java index 4cca7c8f4..e0539f582 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImportImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java index 6a46e1ef9..721276742 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.PropertyRefImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class ReferentialConstraintRoleDeserializer extends AbstractEdmDeserializer<ReferentialConstraintRoleImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java index 331f1b133..e111a3c07 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class TypeAnnotationDeserializer extends AbstractEdmDeserializer<TypeAnnotationImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java index 3bde506c7..e3d0b6a5d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class ActionDeserializer extends AbstractEdmDeserializer<ActionImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java index 7de7a3e10..a12b396ef 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.annotation.DynExprConstructImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class AnnotationDeserializer extends AbstractEdmDeserializer<AnnotationImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java index c46adb5b8..9ff511b54 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java index f316d2f36..cd55f1dd2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class FunctionDeserializer extends AbstractEdmDeserializer<FunctionImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java index f1dc46ff7..d86436174 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core.edm.xml.v4; import org.apache.olingo.client.core.edm.xml.OnDeleteImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java index 839f3c939..1b9f97102 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import java.net.URI; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class ReferenceDeserializer extends AbstractEdmDeserializer<ReferenceImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java index 89c40705a..24ef2006a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class ReturnTypeDeserializer extends AbstractEdmDeserializer<ReturnTypeImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java index d97dcd4c7..cfd43248b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class SingletonDeserializer extends AbstractEdmDeserializer<SingletonImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java index f1b756eca..4e3d89b2c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java @@ -28,7 +28,7 @@ import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.edm.xml.v4.CSDLElement; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class TermDeserializer extends AbstractEdmDeserializer<TermImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java index 28dee4d53..c270cae93 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class TypeDefinitionDeserializer extends AbstractEdmDeserializer<TypeDefinitionImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java index e847c9dac..68aec7d81 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class ApplyDeserializer extends AbstractEdmDeserializer<Apply> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java index b143d70a1..d2ba56c84 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.math.BigInteger; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class CastDeserializer extends AbstractEdmDeserializer<Cast> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java index 3916f8d31..52ad3c1f8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class CollectionDeserializer extends AbstractEdmDeserializer<Collection> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java index 831a8a3dc..b7b7c6655 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java @@ -28,7 +28,7 @@ import java.io.IOException; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ClassUtils; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class DynExprConstructDeserializer extends AbstractEdmDeserializer<DynExprConstructImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java index 51bafd6a4..a92956355 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.math.BigInteger; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class IsOfDeserializer extends AbstractEdmDeserializer<IsOf> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java index da9971399..7f3615f2e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class LabeledElementDeserializer extends AbstractEdmDeserializer<LabeledElement> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java index 192be276d..2bdb28883 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class NullDeserializer extends AbstractEdmDeserializer<Null> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java index 7a524124a..a32965867 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class PropertyValueDeserializer extends AbstractEdmDeserializer<PropertyValue> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java index efe49ccf5..32ae5ba57 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class RecordDeserializer extends AbstractEdmDeserializer<Record> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java index f4fab83c1..804a08d8e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.impl.AbstractEdmDeserializer; +import org.apache.olingo.client.core.op.AbstractEdmDeserializer; public class UrlRefDeserializer extends AbstractEdmDeserializer<UrlRef> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractEdmDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractEdmDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractEdmDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractEdmDeserializer.java index 5850a2deb..ac00cf3a9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractEdmDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractEdmDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractJacksonTool.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractJacksonTool.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java index eb26d95dd..901b17528 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractJacksonTool.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.aalto.stax.InputFactoryImpl; import com.fasterxml.aalto.stax.OutputFactoryImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataBinder.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java index 2c2cdea26..a7f9a442b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataBinder.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import java.io.StringWriter; import java.net.URI; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java index 67acc09b3..483dc7bf8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import java.io.InputStream; import org.apache.olingo.client.api.CommonODataClient; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataReader.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java index 596e8fdcd..031eb5020 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataReader.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import java.io.InputStream; import org.apache.commons.io.IOUtils; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataSerializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java index 4c4305217..48a0b8d41 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/AbstractODataSerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ComplexTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ComplexTypeDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ComplexTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/ComplexTypeDeserializer.java index e07d90722..754bad473 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ComplexTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ComplexTypeDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityContainerDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityContainerDeserializer.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityContainerDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityContainerDeserializer.java index 526912839..131ba9ef7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityContainerDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityContainerDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityKeyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityKeyDeserializer.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityKeyDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityKeyDeserializer.java index 1f6b41547..8462f4a67 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityKeyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityKeyDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntitySetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntitySetDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntitySetDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntitySetDeserializer.java index 7dba1f6d6..d11206e8b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntitySetDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntitySetDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityTypeDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityTypeDeserializer.java index a772b1453..b2775e5f9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EntityTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityTypeDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EnumTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EnumTypeDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EnumTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/EnumTypeDeserializer.java index 42d68ba74..f2b891cb9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/EnumTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EnumTypeDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/InjectableSerializerProvider.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/InjectableSerializerProvider.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/InjectableSerializerProvider.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/InjectableSerializerProvider.java index ec9fd290b..b9b5374f3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/InjectableSerializerProvider.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/InjectableSerializerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataObjectFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataObjectFactoryImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java index cc0b388f9..0b71abc41 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataObjectFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataWriterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataWriterImpl.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java index 5e95f2b4d..7e5c9b4a6 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataWriterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ResourceFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ResourceFactory.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java index 7ee74cde4..da3ead280 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ResourceFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/SchemaDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/SchemaDeserializer.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/SchemaDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/op/SchemaDeserializer.java index ca7eeeafd..47eb1952a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/SchemaDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/SchemaDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op.impl; +package org.apache.olingo.client.core.op; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java index f5e571010..ba9f7c247 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.op.impl.v3; import org.apache.olingo.client.api.data.v3.LinkCollection; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; import org.apache.olingo.client.api.op.v3.ODataBinder; -import org.apache.olingo.client.core.op.impl.AbstractODataBinder; +import org.apache.olingo.client.core.op.AbstractODataBinder; import org.apache.olingo.client.core.v3.ODataClientImpl; public class ODataBinderImpl extends AbstractODataBinder implements ODataBinder { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java index ea2895870..edb98a0d4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java @@ -31,7 +31,7 @@ import org.apache.olingo.client.core.data.v3.JSONServiceDocumentImpl; import org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl; import org.apache.olingo.client.core.edm.xml.v3.EdmxImpl; import org.apache.olingo.client.core.edm.xml.v3.XMLMetadataImpl; -import org.apache.olingo.client.core.op.impl.AbstractODataDeserializer; +import org.apache.olingo.client.core.op.AbstractODataDeserializer; public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java index 6649a3900..2e8a08071 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.op.v3.ODataReader; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.v3.ODataClientImpl; import org.apache.olingo.client.core.edm.EdmClientImpl; -import org.apache.olingo.client.core.op.impl.AbstractODataReader; +import org.apache.olingo.client.core.op.AbstractODataReader; import org.apache.olingo.commons.api.edm.Edm; public class ODataReaderImpl extends AbstractODataReader implements ODataReader { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java index 5ad5cda43..14f5a40d9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core.op.impl.v3; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.core.op.impl.AbstractODataSerializer; +import org.apache.olingo.client.core.op.AbstractODataSerializer; public class ODataSerializerImpl extends AbstractODataSerializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java index 9951db2f6..80863cb1e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java @@ -24,7 +24,7 @@ import org.apache.olingo.client.api.domain.ODataServiceDocument; import org.apache.olingo.client.api.op.v4.ODataBinder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.client.core.op.impl.AbstractODataBinder; +import org.apache.olingo.client.core.op.AbstractODataBinder; public class ODataBinderImpl extends AbstractODataBinder implements ODataBinder { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java index d94753921..95fde7764 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java @@ -29,7 +29,7 @@ import org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl; import org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl; import org.apache.olingo.client.core.edm.xml.v4.EdmxImpl; import org.apache.olingo.client.core.edm.xml.v4.XMLMetadataImpl; -import org.apache.olingo.client.core.op.impl.AbstractODataDeserializer; +import org.apache.olingo.client.core.op.AbstractODataDeserializer; public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java index 8324ccac4..4260ba80a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java @@ -25,7 +25,7 @@ import org.apache.olingo.client.api.format.ODataFormat; import org.apache.olingo.client.api.op.v4.ODataReader; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.edm.EdmClientImpl; -import org.apache.olingo.client.core.op.impl.AbstractODataReader; +import org.apache.olingo.client.core.op.AbstractODataReader; import org.apache.olingo.commons.api.edm.Edm; public class ODataReaderImpl extends AbstractODataReader implements ODataReader { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java index 97557a176..d79b8f84d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core.op.impl.v4; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.core.op.impl.AbstractODataSerializer; +import org.apache.olingo.client.core.op.AbstractODataSerializer; public class ODataSerializerImpl extends AbstractODataSerializer { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java index 663734648..c05eaffca 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java @@ -38,7 +38,7 @@ import org.apache.olingo.client.api.domain.ODataLink; import org.apache.olingo.client.api.domain.ODataProperty; import org.apache.olingo.client.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.client.core.op.impl.ResourceFactory; +import org.apache.olingo.client.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java index 35cc3d6c7..fa0d60f27 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java @@ -33,7 +33,7 @@ import org.apache.olingo.client.api.domain.ODataEntitySetIterator; import org.apache.olingo.client.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.client.core.op.impl.ResourceFactory; +import org.apache.olingo.client.core.op.ResourceFactory; import static org.junit.Assert.assertNotNull; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java index 7de99d3e9..d33da3bb7 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.domain.ODataEntitySet; import org.apache.olingo.client.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.client.core.op.impl.ResourceFactory; +import org.apache.olingo.client.core.op.ResourceFactory; import org.junit.Test; public class EntitySetTest extends AbstractTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java index 0147fc0b8..978da522c 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java @@ -29,7 +29,7 @@ import org.apache.olingo.client.api.domain.ODataLink; import org.apache.olingo.client.api.domain.ODataProperty; import org.apache.olingo.client.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.client.core.op.impl.ResourceFactory; +import org.apache.olingo.client.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.GeospatialCollection; From 9b3e4ebfc966ccac244f0e01d96c95931708b98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org> Date: Mon, 24 Mar 2014 08:24:39 +0100 Subject: [PATCH 3/7] Moving some classes to more appropriate packages --- .../org/apache/olingo/client/core/data/JSONEntryImpl.java | 4 +--- .../olingo/client/core/edm/xml/AbstractComplexType.java | 1 - .../client/core/{op => edm/xml}/AbstractEdmDeserializer.java | 2 +- .../olingo/client/core/edm/xml/AbstractEntityContainer.java | 1 - .../apache/olingo/client/core/edm/xml/AbstractEntitySet.java | 1 - .../olingo/client/core/edm/xml/AbstractEntityType.java | 1 - .../apache/olingo/client/core/edm/xml/AbstractEnumType.java | 1 - .../apache/olingo/client/core/edm/xml/AbstractSchema.java | 1 - .../client/core/{op => edm/xml}/ComplexTypeDeserializer.java | 3 +-- .../olingo/client/core/edm/xml/DataServicesDeserializer.java | 1 - .../apache/olingo/client/core/edm/xml/EdmxDeserializer.java | 1 - .../core/{op => edm/xml}/EntityContainerDeserializer.java | 3 +-- .../client/core/{op => edm/xml}/EntityKeyDeserializer.java | 5 +---- .../org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java | 1 - .../client/core/{op => edm/xml}/EntitySetDeserializer.java | 3 +-- .../client/core/{op => edm/xml}/EntityTypeDeserializer.java | 4 +--- .../client/core/{op => edm/xml}/EnumTypeDeserializer.java | 3 +-- .../olingo/client/core/edm/xml/ParameterDeserializer.java | 1 - .../olingo/client/core/edm/xml/PropertyDeserializer.java | 1 - .../client/core/{op => edm/xml}/SchemaDeserializer.java | 3 +-- .../client/core/edm/xml/v3/AnnotationsDeserializer.java | 2 +- .../client/core/edm/xml/v3/AssociationDeserializer.java | 2 +- .../client/core/edm/xml/v3/AssociationSetDeserializer.java | 2 +- .../client/core/edm/xml/v3/FunctionImportDeserializer.java | 2 +- .../edm/xml/v3/ReferentialConstraintRoleDeserializer.java | 2 +- .../client/core/edm/xml/v3/TypeAnnotationDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/ActionDeserializer.java | 2 +- .../client/core/edm/xml/v4/AnnotationDeserializer.java | 2 +- .../client/core/edm/xml/v4/AnnotationsDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/FunctionDeserializer.java | 2 +- .../core/edm/xml/v4/NavigationPropertyDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/ReferenceDeserializer.java | 2 +- .../client/core/edm/xml/v4/ReturnTypeDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/SingletonDeserializer.java | 2 +- .../olingo/client/core/edm/xml/v4/TermDeserializer.java | 2 +- .../client/core/edm/xml/v4/TypeDefinitionDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/ApplyDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/CastDeserializer.java | 2 +- .../core/edm/xml/v4/annotation/CollectionDeserializer.java | 2 +- .../edm/xml/v4/annotation/DynExprConstructDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/IsOfDeserializer.java | 2 +- .../edm/xml/v4/annotation/LabeledElementDeserializer.java | 2 +- .../client/core/edm/xml/v4/annotation/NullDeserializer.java | 2 +- .../edm/xml/v4/annotation/PropertyValueDeserializer.java | 2 +- .../core/edm/xml/v4/annotation/RecordDeserializer.java | 2 +- .../core/edm/xml/v4/annotation/UrlRefDeserializer.java | 2 +- 46 files changed, 35 insertions(+), 58 deletions(-) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/AbstractEdmDeserializer.java (98%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/ComplexTypeDeserializer.java (97%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/EntityContainerDeserializer.java (97%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/EntityKeyDeserializer.java (91%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/EntitySetDeserializer.java (96%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/EntityTypeDeserializer.java (96%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/EnumTypeDeserializer.java (96%) rename lib/client-core/src/main/java/org/apache/olingo/client/core/{op => edm/xml}/SchemaDeserializer.java (98%) diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryImpl.java index f82ac127a..cafe2897d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.data; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.net.URI; @@ -38,11 +37,10 @@ public class JSONEntryImpl extends AbstractEntry { private String mediaETag; - public void setId(String id) throws ParseException { + public void setId(final String id) throws ParseException { this.setCommonProperty("id", id); } - @JsonIgnore @Override public URI getBaseURI() { URI baseURI = null; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java index 0630a59b7..e09250c31 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractComplexType.java @@ -23,7 +23,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty; import org.apache.olingo.client.api.edm.xml.CommonProperty; import org.apache.olingo.client.api.edm.xml.ComplexType; -import org.apache.olingo.client.core.op.ComplexTypeDeserializer; @JsonDeserialize(using = ComplexTypeDeserializer.class) public abstract class AbstractComplexType extends AbstractEdmItem implements ComplexType { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractEdmDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractEdmDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmDeserializer.java index ac00cf3a9..c3ff9c442 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractEdmDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java index c15266eaf..fb6b22995 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityContainer.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.olingo.client.api.edm.xml.CommonFunctionImport; import org.apache.olingo.client.api.edm.xml.EntityContainer; import org.apache.olingo.client.api.edm.xml.EntitySet; -import org.apache.olingo.client.core.op.EntityContainerDeserializer; @JsonDeserialize(using = EntityContainerDeserializer.class) public abstract class AbstractEntityContainer extends AbstractEdmItem implements EntityContainer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java index 65650f338..d2762adad 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntitySet.java @@ -21,7 +21,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.EntitySet; -import org.apache.olingo.client.core.op.EntitySetDeserializer; @JsonDeserialize(using = EntitySetDeserializer.class) public abstract class AbstractEntitySet extends AbstractEdmItem implements EntitySet { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java index e375323ba..649dbe8c7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEntityType.java @@ -22,7 +22,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import org.apache.olingo.client.api.edm.xml.EntityKey; import org.apache.olingo.client.api.edm.xml.EntityType; -import org.apache.olingo.client.core.op.EntityTypeDeserializer; @JsonDeserialize(using = EntityTypeDeserializer.class) public abstract class AbstractEntityType extends AbstractComplexType implements EntityType { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java index 3730fad15..d84bfbd32 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEnumType.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.olingo.client.api.edm.xml.EnumType; import org.apache.olingo.client.api.edm.xml.Member; -import org.apache.olingo.client.core.op.EnumTypeDeserializer; @JsonDeserialize(using = EnumTypeDeserializer.class) public abstract class AbstractEnumType extends AbstractEdmItem implements EnumType { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java index 6cc2915fc..83ac0ac3b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractSchema.java @@ -24,7 +24,6 @@ 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.EnumType; import org.apache.olingo.client.api.edm.xml.Schema; -import org.apache.olingo.client.core.op.SchemaDeserializer; @JsonDeserialize(using = SchemaDeserializer.class) public abstract class AbstractSchema extends AbstractEdmItem implements Schema { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ComplexTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ComplexTypeDeserializer.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/ComplexTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ComplexTypeDeserializer.java index 754bad473..c9730cbca 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ComplexTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ComplexTypeDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.AbstractComplexType; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java index 94ec6bbde..ef2e2013c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.edm.xml; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import com.fasterxml.jackson.core.JsonParser; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java index a3041f0b5..f617d5ba3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import org.apache.olingo.client.core.edm.xml.v4.ReferenceImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import com.fasterxml.jackson.core.JsonParser; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityContainerDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityContainerDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java index 131ba9ef7..67735a820 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityContainerDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.AbstractEntityContainer; import org.apache.olingo.client.core.edm.xml.v3.AssociationSetImpl; import org.apache.olingo.client.core.edm.xml.v4.ActionImportImpl; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityKeyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyDeserializer.java similarity index 91% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityKeyDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyDeserializer.java index 8462f4a67..4e5435d02 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityKeyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -25,9 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.EntityKeyImpl; -import org.apache.olingo.client.core.edm.xml.PropertyRefImpl; - public class EntityKeyDeserializer extends AbstractEdmDeserializer<EntityKeyImpl> { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java index 8074e6929..b47e0fcb1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityKeyImpl.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.olingo.client.api.edm.xml.EntityKey; import org.apache.olingo.client.api.edm.xml.PropertyRef; -import org.apache.olingo.client.core.op.EntityKeyDeserializer; @JsonDeserialize(using = EntityKeyDeserializer.class) public class EntityKeyImpl extends AbstractEdmItem implements EntityKey { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntitySetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java similarity index 96% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntitySetDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java index d11206e8b..861ea2fd6 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntitySetDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.AbstractEntitySet; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.client.core.edm.xml.v4.NavigationPropertyBindingImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityTypeDeserializer.java similarity index 96% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityTypeDeserializer.java index b2775e5f9..8f3c60d10 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EntityTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityTypeDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,8 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.AbstractEntityType; -import org.apache.olingo.client.core.edm.xml.EntityKeyImpl; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EnumTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeDeserializer.java similarity index 96% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/EnumTypeDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeDeserializer.java index f2b891cb9..9c99ea286 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/EnumTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,7 +26,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.edm.xml.AbstractEnumType; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java index cb0178dd2..2aa3cddcb 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java @@ -27,7 +27,6 @@ import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; import org.apache.olingo.client.api.edm.xml.v3.ParameterMode; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ParameterDeserializer extends AbstractEdmDeserializer<AbstractParameter> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java index ec4074617..8815e44a2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java @@ -24,7 +24,6 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.olingo.client.api.edm.ConcurrencyMode; import org.apache.olingo.client.api.edm.StoreGeneratedPattern; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/SchemaDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/SchemaDeserializer.java rename to lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java index 47eb1952a..afa0a84ac 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/SchemaDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -25,7 +25,6 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractSchema; import org.apache.olingo.client.core.edm.xml.v3.AssociationImpl; import org.apache.olingo.client.core.edm.xml.v3.UsingImpl; import org.apache.olingo.client.core.edm.xml.v3.ValueTermImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java index b1e762411..a8a88eb90 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java index 7031453a6..c1d422d3e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class AssociationDeserializer extends AbstractEdmDeserializer<AssociationImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java index 1f74893cf..f7268c278 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class AssociationSetDeserializer extends AbstractEdmDeserializer<AssociationSetImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java index e0539f582..3b7c4c7ef 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class FunctionImportDeserializer extends AbstractEdmDeserializer<FunctionImportImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java index 721276742..4bd4e1a4c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.PropertyRefImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class ReferentialConstraintRoleDeserializer extends AbstractEdmDeserializer<ReferentialConstraintRoleImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java index e111a3c07..fd2aac38c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class TypeAnnotationDeserializer extends AbstractEdmDeserializer<TypeAnnotationImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java index e3d0b6a5d..fd0c21410 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class ActionDeserializer extends AbstractEdmDeserializer<ActionImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java index a12b396ef..129926d83 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.annotation.DynExprConstructImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class AnnotationDeserializer extends AbstractEdmDeserializer<AnnotationImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java index 9ff511b54..6c8a4f65e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class AnnotationsDeserializer extends AbstractEdmDeserializer<AnnotationsImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java index cd55f1dd2..e1e0707c4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class FunctionDeserializer extends AbstractEdmDeserializer<FunctionImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java index d86436174..8ed96691f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyDeserializer.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core.edm.xml.v4; import org.apache.olingo.client.core.edm.xml.OnDeleteImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java index 1b9f97102..94f1ed7e1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import java.net.URI; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class ReferenceDeserializer extends AbstractEdmDeserializer<ReferenceImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java index 24ef2006a..85ecc6cf9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class ReturnTypeDeserializer extends AbstractEdmDeserializer<ReturnTypeImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java index cfd43248b..d79bd22a4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class SingletonDeserializer extends AbstractEdmDeserializer<SingletonImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java index 4e3d89b2c..feb85e557 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermDeserializer.java @@ -28,7 +28,7 @@ import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.edm.xml.v4.CSDLElement; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class TermDeserializer extends AbstractEdmDeserializer<TermImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java index c270cae93..8fe90259f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.commons.lang3.BooleanUtils; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class TypeDefinitionDeserializer extends AbstractEdmDeserializer<TypeDefinitionImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java index 68aec7d81..56251a3e8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class ApplyDeserializer extends AbstractEdmDeserializer<Apply> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java index d2ba56c84..25ea59413 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastDeserializer.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.math.BigInteger; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class CastDeserializer extends AbstractEdmDeserializer<Cast> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java index 52ad3c1f8..8ef4018ae 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class CollectionDeserializer extends AbstractEdmDeserializer<Collection> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java index b7b7c6655..59266a5aa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynExprConstructDeserializer.java @@ -28,7 +28,7 @@ import java.io.IOException; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ClassUtils; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class DynExprConstructDeserializer extends AbstractEdmDeserializer<DynExprConstructImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java index a92956355..160ce631f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfDeserializer.java @@ -27,7 +27,7 @@ import java.io.IOException; import java.math.BigInteger; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class IsOfDeserializer extends AbstractEdmDeserializer<IsOf> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java index 7f3615f2e..df3f7476c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class LabeledElementDeserializer extends AbstractEdmDeserializer<LabeledElement> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java index 2bdb28883..36c679173 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/NullDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class NullDeserializer extends AbstractEdmDeserializer<Null> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java index a32965867..6841c6ea3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class PropertyValueDeserializer extends AbstractEdmDeserializer<PropertyValue> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java index 32ae5ba57..279eb8cda 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordDeserializer.java @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class RecordDeserializer extends AbstractEdmDeserializer<Record> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java index 804a08d8e..e2fcfbb1e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefDeserializer.java @@ -25,7 +25,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import java.io.IOException; -import org.apache.olingo.client.core.op.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; public class UrlRefDeserializer extends AbstractEdmDeserializer<UrlRef> { From 0b4b86c0b28ab47ad04c846c02175cfeab8454b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org> Date: Mon, 24 Mar 2014 08:50:16 +0100 Subject: [PATCH 4/7] [OLINGO-200] Moving domain objects to commons-api --- lib/client-api/pom.xml | 5 -- .../client/api/CommonConfiguration.java | 8 ++-- .../olingo/client/api/CommonODataClient.java | 6 +-- .../apache/olingo/client/api/Constants.java | 2 +- .../request/cud/CommonCUDRequestFactory.java | 8 ++-- .../request/cud/ODataDeleteRequest.java | 2 +- .../request/cud/ODataEntityCreateRequest.java | 2 +- .../request/cud/ODataEntityUpdateRequest.java | 2 +- .../request/cud/ODataLinkCreateRequest.java | 2 +- .../request/cud/ODataLinkUpdateRequest.java | 2 +- .../cud/ODataPropertyUpdateRequest.java | 2 +- .../request/cud/ODataValueUpdateRequest.java | 2 +- .../invoke/CommonInvokeRequestFactory.java | 4 +- .../request/invoke/ODataInvokeRequest.java | 6 +-- .../request/invoke/ODataNoContent.java | 2 +- .../request/retrieve/ODataEntityRequest.java | 4 +- .../ODataEntitySetIteratorRequest.java | 2 +- .../retrieve/ODataEntitySetRequest.java | 4 +- .../request/retrieve/ODataMediaRequest.java | 2 +- .../retrieve/ODataMetadataRequest.java | 2 +- .../retrieve/ODataPropertyRequest.java | 4 +- .../retrieve/ODataServiceDocumentRequest.java | 4 +- .../request/retrieve/ODataValueRequest.java | 4 +- .../v3/ODataLinkCollectionRequest.java | 2 +- .../streamed/ODataStreamedEntityRequest.java | 2 +- .../response/ODataEntityCreateResponse.java | 2 +- .../response/ODataEntityUpdateResponse.java | 2 +- .../response/ODataInvokeResponse.java | 2 +- .../ODataMediaEntityCreateResponse.java | 2 +- .../ODataMediaEntityUpdateResponse.java | 2 +- .../response/ODataPropertyUpdateResponse.java | 2 +- .../response/ODataValueUpdateResponse.java | 2 +- .../apache/olingo/client/api/data/Entry.java | 2 +- .../api/domain/ODataEntitySetIterator.java | 4 +- .../client/api/op/CommonODataBinder.java | 10 ++-- .../api/op/CommonODataDeserializer.java | 4 +- .../client/api/op/CommonODataReader.java | 12 ++--- .../olingo/client/api/op/ODataSerializer.java | 2 +- .../olingo/client/api/op/ODataWriter.java | 10 ++-- .../client/api/op/v3/ODataDeserializer.java | 2 +- .../olingo/client/api/op/v3/ODataReader.java | 2 +- .../client/core/AbstractConfiguration.java | 8 ++-- .../client/core/AbstractODataClient.java | 2 +- .../request/ODataRequestImpl.java | 6 +-- .../cud/AbstractCUDRequestFactory.java | 8 ++-- .../request/cud/ODataDeleteRequestImpl.java | 2 +- .../cud/ODataEntityCreateRequestImpl.java | 4 +- .../cud/ODataEntityUpdateRequestImpl.java | 4 +- .../cud/ODataLinkCreateRequestImpl.java | 4 +- .../cud/ODataLinkUpdateRequestImpl.java | 4 +- .../cud/ODataPropertyUpdateRequestImpl.java | 4 +- .../cud/ODataValueUpdateRequestImpl.java | 4 +- .../invoke/AbstractInvokeRequestFactory.java | 2 +- .../invoke/ODataInvokeRequestImpl.java | 14 +++--- .../invoke/v3/InvokeRequestFactoryImpl.java | 10 ++-- .../invoke/v4/InvokeRequestFactoryImpl.java | 4 +- .../retrieve/ODataEntityRequestImpl.java | 4 +- .../ODataEntitySetIteratorRequestImpl.java | 2 +- .../retrieve/ODataEntitySetRequestImpl.java | 4 +- .../retrieve/ODataMediaRequestImpl.java | 2 +- .../retrieve/ODataMetadataRequestImpl.java | 2 +- .../retrieve/ODataPropertyRequestImpl.java | 4 +- .../request/retrieve/ODataRawRequestImpl.java | 2 +- .../ODataServiceDocumentRequestImpl.java | 4 +- .../retrieve/ODataValueRequestImpl.java | 4 +- .../v3/ODataLinkCollectionRequestImpl.java | 2 +- .../AbstractODataStreamedEntityRequest.java | 2 +- .../AbstractODataStreamedRequest.java | 2 +- .../ODataMediaEntityCreateRequestImpl.java | 2 +- .../ODataMediaEntityUpdateRequestImpl.java | 2 +- .../client/core/data/AbstractEntry.java | 2 +- .../core/data/AbstractJsonDeserializer.java | 2 +- .../client/core/data/AtomDeserializer.java | 2 +- .../core/data/AtomPropertyDeserializer.java | 2 +- .../core/data/JSONEntryDeserializer.java | 4 +- .../client/core/data/JSONEntrySerializer.java | 2 +- .../core/domain/ODataGeospatialValueImpl.java | 4 +- .../core/domain/ODataPrimitiveValueImpl.java | 4 +- .../client/core/op/AbstractODataBinder.java | 24 +++++----- .../core/op/AbstractODataDeserializer.java | 4 +- .../client/core/op/AbstractODataReader.java | 16 +++---- .../core/op/AbstractODataSerializer.java | 2 +- .../core/op/ODataObjectFactoryImpl.java | 24 +++++----- .../client/core/op/ODataWriterImpl.java | 10 ++-- .../client/core/op/ResourceFactory.java | 2 +- .../op/impl/v3/ODataDeserializerImpl.java | 2 +- .../core/op/impl/v3/ODataReaderImpl.java | 4 +- .../core/op/impl/v4/ODataBinderImpl.java | 2 +- .../op/impl/v4/ODataDeserializerImpl.java | 2 +- .../core/op/impl/v4/ODataReaderImpl.java | 4 +- .../client/core/AbstractPrimitiveTest.java | 8 ++-- .../client/core/AbstractPropertyTest.java | 12 ++--- .../olingo/client/core/AbstractTest.java | 4 +- .../client/core/it/AbstractTestITCase.java | 20 ++++---- .../client/core/it/v3/AsyncTestITCase.java | 4 +- .../client/core/it/v3/CountTestITCase.java | 4 +- .../core/it/v3/EntityCreateTestITCase.java | 12 ++--- .../core/it/v3/EntityRetrieveTestITCase.java | 14 +++--- .../core/it/v3/EntitySetTestITCase.java | 4 +- .../core/it/v3/EntityUpdateTestITCase.java | 4 +- .../client/core/it/v3/ErrorTestITCase.java | 4 +- .../core/it/v3/FilterFactoryTestITCase.java | 2 +- .../client/core/it/v3/FilterTestITCase.java | 2 +- .../core/it/v3/KeyAsSegmentTestITCase.java | 4 +- .../client/core/it/v3/LinkTestITCase.java | 4 +- .../core/it/v3/MediaEntityTestITCase.java | 8 ++-- .../it/v3/NavigationLinkCreateTestITCase.java | 20 ++++---- .../client/core/it/v3/OpenTypeTestITCase.java | 6 +-- .../core/it/v3/PrimitiveKeysTestITCase.java | 4 +- .../it/v3/PropertyRetrieveTestITCase.java | 14 +++--- .../client/core/it/v3/PropertyTestITCase.java | 10 ++-- .../core/it/v3/PropertyValueTestITCase.java | 6 +-- .../core/it/v3/QueryOptionsTestITCase.java | 8 ++-- .../v3/ServiceDocumentRetrieveTestITCase.java | 4 +- .../core/it/v3/ServiceDocumentTestITCase.java | 4 +- .../olingo/client/core/v3/AtomTest.java | 4 +- .../olingo/client/core/v3/EntitySetTest.java | 4 +- .../olingo/client/core/v3/EntityTest.java | 8 ++-- .../olingo/client/core/v3/ErrorTest.java | 2 +- .../olingo/client/core/v3/JSONTest.java | 4 +- .../client/core/v3/PrimitiveValueTest.java | 2 +- .../client/core/v3/ServiceDocumentTest.java | 4 +- .../client/core/v4/PrimitiveValueTest.java | 2 +- .../client/core/v4/ServiceDocumentTest.java | 4 +- lib/commons-api/pom.xml | 5 ++ .../api/domain/AbstractODataValue.java | 2 +- .../api/domain/ODataCollectionValue.java | 2 +- .../api/domain/ODataComplexValue.java | 2 +- .../commons}/api/domain/ODataEntity.java | 2 +- .../commons}/api/domain/ODataEntitySet.java | 2 +- .../api/domain/ODataGeospatialValue.java | 2 +- .../api/domain/ODataInlineEntity.java | 2 +- .../api/domain/ODataInlineEntitySet.java | 2 +- .../api/domain/ODataInvokeResult.java | 2 +- .../olingo/commons}/api/domain/ODataItem.java | 2 +- .../olingo/commons}/api/domain/ODataLink.java | 2 +- .../commons}/api/domain/ODataLinkType.java | 10 ++-- .../api/domain/ODataObjectFactory.java | 2 +- .../commons}/api/domain/ODataOperation.java | 2 +- .../api/domain/ODataPrimitiveValue.java | 2 +- .../commons}/api/domain/ODataProperty.java | 2 +- .../api/domain/ODataPropertyType.java | 2 +- .../api/domain/ODataServiceDocument.java | 2 +- .../commons}/api/domain/ODataValue.java | 2 +- .../commons/api/format/ContentType.java | 47 +++++++++++++++++++ .../commons}/api/format/ODataFormat.java | 14 +++--- .../commons}/api/format/ODataMediaFormat.java | 28 +++++------ .../commons}/api/format/ODataPubFormat.java | 14 +++--- .../commons}/api/format/ODataValueFormat.java | 8 ++-- 149 files changed, 403 insertions(+), 362 deletions(-) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/AbstractODataValue.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataCollectionValue.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataComplexValue.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataEntity.java (99%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataEntitySet.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataGeospatialValue.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataInlineEntity.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataInlineEntitySet.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataInvokeResult.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataItem.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataLink.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataLinkType.java (90%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataObjectFactory.java (99%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataOperation.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataPrimitiveValue.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataProperty.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataPropertyType.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataServiceDocument.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/domain/ODataValue.java (97%) create mode 100644 lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/format/ODataFormat.java (82%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/format/ODataMediaFormat.java (67%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/format/ODataPubFormat.java (82%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/format/ODataValueFormat.java (90%) diff --git a/lib/client-api/pom.xml b/lib/client-api/pom.xml index eb3f9e3b9..017ec129a 100644 --- a/lib/client-api/pom.xml +++ b/lib/client-api/pom.xml @@ -49,11 +49,6 @@ <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> </dependency> - - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> </dependencies> </project> diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java index 48f2614de..59786f3a7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonConfiguration.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.HttpUriRequestFactory; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java index 6c4436081..4b708d9eb 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java @@ -24,9 +24,9 @@ import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFa import org.apache.olingo.client.api.communication.request.invoke.CommonInvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.streamed.CommonStreamedRequestFactory; -import org.apache.olingo.client.api.domain.ODataObjectFactory; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataObjectFactory; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.client.api.op.CommonODataBinder; import org.apache.olingo.client.api.op.CommonODataDeserializer; import org.apache.olingo.client.api.op.CommonODataReader; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java index 6f94915e2..b4c3d6b77 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java @@ -24,7 +24,7 @@ import javax.xml.namespace.QName; /** * Constant values related to the OData protocol. */ -public class Constants { +public interface Constants { // Other stuff public final static String UTF8 = "UTF-8"; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java index c0f5b2ec1..6f6f502dd 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CommonCUDRequestFactory.java @@ -21,10 +21,10 @@ package org.apache.olingo.client.api.communication.request.cud; import java.io.Serializable; import java.net.URI; import org.apache.olingo.client.api.communication.request.UpdateType; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; /** * OData request factory class. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java index 7206f50b5..79b2641fe 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataDeleteRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData delete request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java index 357ed9a79..02f41e7c9 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityCreateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData create request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java index bff13dcbf..11bc797cc 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataEntityUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData update request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java index 65c070d86..adf6f0d49 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkCreateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an insert link OData request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java index 624c6932a..00f9216e8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataLinkUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an update link OData request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java index 683c3e393..53fa4473e 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataPropertyUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData update entity property request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java index 708578843..753fde87f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataValueUpdateRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.cud; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; /** * This class implements an OData update entity property value request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java index e7104bc04..0198b9298 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/CommonInvokeRequestFactory.java @@ -21,8 +21,8 @@ package org.apache.olingo.client.api.communication.request.invoke; import java.io.Serializable; import java.net.URI; import java.util.LinkedHashMap; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java index 22360fb71..986a13bf7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataInvokeRequest.java @@ -21,9 +21,9 @@ package org.apache.olingo.client.api.communication.request.invoke; import java.util.Map; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData invoke operation request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java index e9c0379ca..4f3251602 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/ODataNoContent.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.api.communication.request.invoke; import java.io.Serializable; -import org.apache.olingo.client.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; /** * Marker class for invoke with no return type. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java index 9dd7104b8..a22f82c02 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData retrieve query request returning a single entity. 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 2d7c369cb..dd2cf46da 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 @@ -19,7 +19,7 @@ package org.apache.olingo.client.api.communication.request.retrieve; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java index d76d04a48..fbafafd42 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntitySetRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java index 4500152ea..a4bbf3cd2 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMediaRequest.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.api.communication.request.retrieve; import java.io.InputStream; -import org.apache.olingo.client.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; /** * This class implements an OData media query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java index c87e449d3..3dcc81b6b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataMetadataRequest.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.Edm; /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java index 9806a2e85..7492e11ab 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataPropertyRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData entity property query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java index 862ed490b..580798ca6 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataServiceDocumentRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData service document request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java index e731dfe68..e78067a11 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataValueRequest.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; /** * This class implements an OData entity property value query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java index 7cfba7b75..1494aeaeb 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/ODataLinkCollectionRequest.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.communication.request.retrieve.v3; import org.apache.olingo.client.api.communication.request.retrieve.ODataRetrieveRequest; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData link query request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java index 3753016ea..7d898f50c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/streamed/ODataStreamedEntityRequest.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.api.communication.request.streamed; import org.apache.olingo.client.api.communication.request.ODataStreamManager; import org.apache.olingo.client.api.communication.request.ODataStreamedRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * Abstract class representing a request concerning a streamed entity. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java index c4eaf22f0..5fd7fb81b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityCreateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an OData entity create request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java index fec48d611..6b84630c6 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataEntityUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an OData update request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java index 8a5cdaa19..ab1d89078 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataInvokeResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; /** * This class implements a response to a specific invoke request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java index 98bd90efc..ea3b8b7ce 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityCreateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an Odata media entity create request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java index e24b61575..f55dac81c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataMediaEntityUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; /** * This class implements the response to an Odata media entity update request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java index c398aa207..23bfc1e09 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataPropertyUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataProperty; /** * This class implements the response to an OData update entity property request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java index 9d8855b2b..8a0ab1b1d 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataValueUpdateResponse.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.communication.response; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; /** * This class implements the response to an OData update entity property request. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java index 78a7b93fc..0fcf77c99 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.data; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataOperation; import java.net.URI; import java.util.List; 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/ODataEntitySetIterator.java index 26ef195d3..8c1db4d49 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/ODataEntitySetIterator.java @@ -31,7 +31,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java index 94375f66a..8dd723226 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java @@ -25,11 +25,11 @@ import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; public interface CommonODataBinder extends Serializable { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java index d0edb3b9b..0c0428ca5 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java @@ -26,8 +26,8 @@ import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * Utility class for serialization. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java index ceb7f6bdd..3f28f623c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java @@ -21,12 +21,12 @@ package org.apache.olingo.client.api.op; import java.io.InputStream; import java.io.Serializable; import org.apache.olingo.client.api.data.ODataError; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.Edm; /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java index e7f968254..0734586d3 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java @@ -25,7 +25,7 @@ import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; /** * Utility class for serialization. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java index dd7afcd59..b83b2cd72 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataWriter.java @@ -21,11 +21,11 @@ package org.apache.olingo.client.api.op; import java.io.InputStream; import java.io.Serializable; import java.util.Collection; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * OData writer. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java index 1b4a98b49..99d840da8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.op.v3; import java.io.InputStream; import org.apache.olingo.client.api.data.v3.LinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.CommonODataDeserializer; public interface ODataDeserializer extends CommonODataDeserializer { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java index bb436ad58..7049617e0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataReader.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.op.v3; import java.io.InputStream; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.CommonODataReader; public interface ODataReader extends CommonODataReader { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java index 5c32aecab..f50ced36c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractConfiguration.java @@ -24,10 +24,10 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import org.apache.olingo.client.api.CommonConfiguration; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.HttpUriRequestFactory; import org.apache.olingo.client.core.http.DefaultHttpClientFactory; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java index b5cfdeabc..6c889e818 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.domain.ODataObjectFactory; +import org.apache.olingo.commons.api.domain.ODataObjectFactory; import org.apache.olingo.client.api.op.ODataWriter; import org.apache.olingo.client.core.domain.ODataGeospatialValueImpl; import org.apache.olingo.client.core.domain.ODataPrimitiveValueImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java index d088e97ef..44f7c4540 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java @@ -43,9 +43,9 @@ import org.apache.olingo.client.api.communication.header.ODataHeaders; import org.apache.olingo.client.api.communication.request.ODataRequest; import org.apache.olingo.client.api.communication.request.ODataStreamer; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.data.JSONErrorImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java index 4659d15e1..cb82cbd99 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/AbstractCUDRequestFactory.java @@ -29,10 +29,10 @@ import org.apache.olingo.client.api.communication.request.cud.ODataLinkCreateReq import org.apache.olingo.client.api.communication.request.cud.ODataLinkUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.client.api.http.HttpMethod; public abstract class AbstractCUDRequestFactory implements CommonCUDRequestFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java index 720c5b679..fccfa3d13 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataDeleteRequestImpl.java @@ -26,7 +26,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java index 6cf1927bd..c22b5de81 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityCreateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java index 012d975e8..565c59e37 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataEntityUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java index 0f9186448..e64579dff 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkCreateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataLinkCreateRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java index 0fea3a912..2644189f5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataLinkUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataLinkUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java index 04c87ccb7..b3be3eb2f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataPropertyUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java index dc3a7272d..d424d6281 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/ODataValueUpdateRequestImpl.java @@ -28,8 +28,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java index a9c6dfcb9..eb0d45b8c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractInvokeRequestFactory.java @@ -22,7 +22,7 @@ import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.invoke.CommonInvokeRequestFactory; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; -import org.apache.olingo.client.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java index c6355e4b3..f15879e72 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/ODataInvokeRequestImpl.java @@ -35,13 +35,13 @@ import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent; import org.apache.olingo.client.api.communication.response.ODataInvokeResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java index 0ccb3c72d..2487dd9fa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/InvokeRequestFactoryImpl.java @@ -25,11 +25,11 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent; import org.apache.olingo.client.api.communication.request.invoke.v3.InvokeRequestFactory; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory; import org.apache.olingo.client.core.communication.request.invoke.ODataInvokeRequestImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java index 0e7f4b14b..d6f929da2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/InvokeRequestFactoryImpl.java @@ -24,8 +24,8 @@ import org.apache.commons.lang3.NotImplementedException; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.v4.InvokeRequestFactory; -import org.apache.olingo.client.api.domain.ODataInvokeResult; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java index 2390ac3f8..447f54346 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java @@ -24,8 +24,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData retrieve query request returning a single entity. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java index 261611c42..bfdddef8f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java @@ -25,7 +25,7 @@ import org.apache.olingo.client.api.CommonODataClient; 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.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java index 1decb5405..ef191bad2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java @@ -24,8 +24,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * This class implements an OData EntitySet query request. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java index b2a0f5d2a..4460be309 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; import org.apache.olingo.client.api.http.HttpClientException; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java index 58c7cb75d..d5ee545cf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMetadataRequestImpl.java @@ -26,7 +26,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataMetadataRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.Edm; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java index 5055a750d..a768906f1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java @@ -25,8 +25,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpClientException; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java index 4226cc208..d6a2a9933 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataRawRequestImpl.java @@ -27,7 +27,7 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; 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.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.ODataRequestImpl; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java index 1fb98da9b..128e2504f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java @@ -24,8 +24,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; /** * This class implements an OData service document request. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java index fd4e64727..345bc5892 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java @@ -25,8 +25,8 @@ import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.core.domain.ODataPrimitiveValueImpl; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java index 0cdd38ac6..70044b10c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java @@ -26,7 +26,7 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.communication.request.retrieve.v3.ODataLinkCollectionRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.core.communication.request.retrieve.AbstractODataRetrieveRequest; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java index d19d0d5ef..84a22536e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedEntityRequest.java @@ -23,7 +23,7 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataStreamManager; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamedEntityRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java index 5563a74bb..efd0cf20a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/AbstractODataStreamedRequest.java @@ -34,7 +34,7 @@ import org.apache.olingo.client.api.communication.request.ODataStreamedRequest; import org.apache.olingo.client.api.communication.request.ODataStreamer; import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest; import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataMediaFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.communication.request.Wrapper; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java index b69a35a0f..f8487bc75 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityCreateRequestImpl.java @@ -28,7 +28,7 @@ import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.streamed.MediaEntityCreateStreamManager; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest; import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java index f6dc09b00..4f0edce86 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataMediaEntityUpdateRequestImpl.java @@ -28,7 +28,7 @@ import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.streamed.MediaEntityUpdateStreamManager; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java index f92c44b4a..8b513bffd 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java @@ -24,7 +24,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataOperation; /** * Abstract base for classes implementing an OData entry in Atom and JSON. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java index 74b29fbce..4b0ee0ed0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.CollectionValue; import org.apache.olingo.client.api.data.ComplexValue; import org.apache.olingo.client.api.data.Value; -import org.apache.olingo.client.api.domain.ODataPropertyType; +import org.apache.olingo.commons.api.domain.ODataPropertyType; import org.apache.olingo.client.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java index 8893b9171..74d98a6cc 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java @@ -31,7 +31,7 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import org.apache.http.entity.ContentType; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java index 884d81583..736d791c0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java @@ -28,7 +28,7 @@ import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.CollectionValue; import org.apache.olingo.client.api.data.ComplexValue; import org.apache.olingo.client.api.data.Value; -import org.apache.olingo.client.api.domain.ODataPropertyType; +import org.apache.olingo.commons.api.domain.ODataPropertyType; import org.apache.olingo.client.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java index 378d676e8..2626a95b3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java @@ -36,8 +36,8 @@ import java.util.Map; import java.util.Set; import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.domain.ODataLinkType; -import org.apache.olingo.client.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataLinkType; +import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java index 2e48f7303..348015e54 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java @@ -31,7 +31,7 @@ import org.apache.olingo.client.api.Constants; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.domain.ODataLinkType; +import org.apache.olingo.commons.api.domain.ODataLinkType; /** * Writes out JSON string from an entry. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java index 43ef05600..daa63a3a8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataGeospatialValueImpl.java @@ -20,8 +20,8 @@ package org.apache.olingo.client.core.domain; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.olingo.client.api.domain.AbstractODataValue; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.AbstractODataValue; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; import org.apache.olingo.commons.api.edm.EdmGeospatialType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java index e6a040868..aac8ee389 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java @@ -23,8 +23,8 @@ import java.util.Calendar; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.domain.AbstractODataValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.AbstractODataValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; 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/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java index a7f9a442b..4e53ce3e9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java @@ -31,18 +31,18 @@ import org.apache.olingo.client.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.ServiceDocumentItem; import org.apache.olingo.client.api.data.Value; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataOperation; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataOperation; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.CommonODataBinder; import org.apache.olingo.client.core.data.CollectionValueImpl; import org.apache.olingo.client.core.data.ComplexValueImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java index 483dc7bf8..2b4385ec2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java @@ -24,8 +24,8 @@ import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.ODataError; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.CommonODataDeserializer; import org.apache.olingo.client.core.data.AtomDeserializer; import org.apache.olingo.client.core.data.AtomEntryImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java index 031eb5020..b0869cf32 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java @@ -23,16 +23,16 @@ import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.data.ODataError; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.api.edm.xml.XMLMetadata; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.op.CommonODataReader; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.slf4j.Logger; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java index 48a0b8d41..7a1a01534 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java @@ -30,7 +30,7 @@ import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Link; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.ODataSerializer; import org.apache.olingo.client.core.data.AtomEntryImpl; import org.apache.olingo.client.core.data.AtomFeedImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java index 0b71abc41..a7bf76d58 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java @@ -20,18 +20,18 @@ package org.apache.olingo.client.core.op; import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.domain.ODataLinkType; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataObjectFactory; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataLinkType; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataObjectFactory; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; public class ODataObjectFactoryImpl implements ODataObjectFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java index 7e5c9b4a6..80f4f11e2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.Collections; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.ODataWriter; public class ODataWriterImpl implements ODataWriter { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java index da3ead280..8b44e2b6b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.op; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.data.AtomEntryImpl; import org.apache.olingo.client.core.data.AtomFeedImpl; import org.apache.olingo.client.core.data.AtomPropertyImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java index edb98a0d4..0baf40345 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java @@ -22,7 +22,7 @@ import java.io.InputStream; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.v3.LinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v3.ODataDeserializer; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.data.v3.JSONLinkCollectionImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java index 2e8a08071..2c5a7d17e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataReaderImpl.java @@ -20,9 +20,9 @@ package org.apache.olingo.client.core.op.impl.v3; import java.io.InputStream; -import org.apache.olingo.client.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v3.ODataReader; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.v3.ODataClientImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java index 80863cb1e..9c81baf90 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataBinderImpl.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.core.op.impl.v4; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.ServiceDocumentItem; -import org.apache.olingo.client.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.client.api.op.v4.ODataBinder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.api.v4.ODataClient; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java index 95fde7764..3b825e251 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java @@ -22,7 +22,7 @@ import java.io.InputStream; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v4.ODataDeserializer; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java index 4260ba80a..1a93ce144 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataReaderImpl.java @@ -20,8 +20,8 @@ package org.apache.olingo.client.core.op.impl.v4; import java.io.InputStream; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v4.ODataReader; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.edm.EdmClientImpl; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java index df66603d2..fe3f0981f 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java @@ -29,10 +29,10 @@ import java.util.List; import java.util.UUID; import org.apache.commons.codec.binary.Base64; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.domain.ODataGeospatialValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataGeospatialValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java index a67f8b8b2..37f2688cd 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPropertyTest.java @@ -27,12 +27,12 @@ import java.io.IOException; import java.io.InputStream; import java.util.Iterator; import org.apache.commons.io.IOUtils; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java index 9133b0e1d..b579962b3 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractTest.java @@ -21,8 +21,8 @@ package org.apache.olingo.client.core; import java.util.Locale; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.custommonkey.xmlunit.XMLUnit; import org.junit.BeforeClass; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java index 1a30ef70f..5e7ea2f1a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java @@ -52,16 +52,16 @@ import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResp import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.data.Entry; import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java index 294d190e4..21d37177a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/AsyncTestITCase.java @@ -35,8 +35,8 @@ import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEnt import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Ignore; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java index 455d3768f..f004c26c7 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/CountTestITCase.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; public class CountTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java index d16f060e4..8146830b5 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java @@ -39,12 +39,12 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.NoContentException; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java index c05eaffca..609bd9a2d 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java @@ -30,13 +30,13 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe 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.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java index fa0d60f27..aaa9ed7f8 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java @@ -28,9 +28,9 @@ 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.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.client.core.op.ResourceFactory; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java index 6e918e968..129f086a8 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java @@ -31,8 +31,8 @@ import org.apache.olingo.client.api.communication.request.UpdateType; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java index a61b853df..ed8a776a0 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ErrorTestITCase.java @@ -32,8 +32,8 @@ import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java index ece7364c8..28c354d96 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterFactoryTestITCase.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.core.it.v3; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.uri.v3.FilterArgFactory; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java index a2d9a90d6..cbcf046cd 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/FilterTestITCase.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.it.v3; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; -import org.apache.olingo.client.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java index 1a3123b62..9c2a9f5f6 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/KeyAsSegmentTestITCase.java @@ -21,8 +21,8 @@ package org.apache.olingo.client.core.it.v3; import org.apache.olingo.client.api.communication.request.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java index a296f9462..b56dde693 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/LinkTestITCase.java @@ -32,9 +32,9 @@ import org.apache.olingo.client.api.communication.request.cud.ODataLinkUpdateReq import org.apache.olingo.client.api.communication.request.retrieve.v3.ODataLinkCollectionRequest; import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java index 33446cf3e..33502045a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/MediaEntityTestITCase.java @@ -36,10 +36,10 @@ import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreat import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.communication.response.ODataStreamUpdateResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataMediaFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataMediaFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java index a1a90f999..b1e385dc1 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/NavigationLinkCreateTestITCase.java @@ -38,16 +38,16 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySe import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntity; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntity; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java index 2d06ba058..091d0af80 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/OpenTypeTestITCase.java @@ -28,9 +28,9 @@ import java.util.UUID; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java index d69fb6838..c6763e98e 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PrimitiveKeysTestITCase.java @@ -25,8 +25,8 @@ import java.math.BigDecimal; import java.util.UUID; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.junit.Test; public class PrimitiveKeysTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java index 331c73bd4..314e93416 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyRetrieveTestITCase.java @@ -29,13 +29,13 @@ import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataComplexValue; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataComplexValue; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java index 56eb4fbd9..28d487f74 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyTestITCase.java @@ -35,11 +35,11 @@ import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateRe import org.apache.olingo.client.api.communication.response.ODataRawResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse; -import org.apache.olingo.client.api.domain.ODataCollectionValue; -import org.apache.olingo.client.api.domain.ODataPrimitiveValue; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java index 1acb6be34..b8dd0a831 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/PropertyValueTestITCase.java @@ -24,9 +24,9 @@ import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataValue; -import org.apache.olingo.client.api.format.ODataValueFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataValue; +import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java index 350148248..d34da8884 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java @@ -29,10 +29,10 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.domain.ODataInlineEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.v3.URIBuilder.InlineCount; import org.apache.olingo.client.core.data.AtomEntryImpl; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java index 40a7ecf24..f5a9fa9d5 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentRetrieveTestITCase.java @@ -23,8 +23,8 @@ import java.net.URI; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; public class ServiceDocumentRetrieveTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java index 820b3a058..0a5aefc6a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/ServiceDocumentTestITCase.java @@ -23,8 +23,8 @@ import static org.junit.Assert.assertEquals; import java.net.URI; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; public class ServiceDocumentTestITCase extends AbstractTestITCase { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java index 6963cee56..755b44b59 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/AtomTest.java @@ -29,8 +29,8 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.AtomLinksQualifier; import org.custommonkey.xmlunit.Diff; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java index d33da3bb7..792ddb750 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java @@ -24,8 +24,8 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.InputStream; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.domain.ODataEntitySet; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntitySet; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.op.ResourceFactory; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java index 978da522c..d8f02a6d1 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java @@ -24,10 +24,10 @@ import static org.junit.Assert.assertTrue; import java.io.InputStream; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.domain.ODataEntity; -import org.apache.olingo.client.api.domain.ODataLink; -import org.apache.olingo.client.api.domain.ODataProperty; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.domain.ODataEntity; +import org.apache.olingo.commons.api.domain.ODataLink; +import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java index b76c45300..57f35164a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.data.ODataError; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java index 83c7d05c0..d57c561bb 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java @@ -30,8 +30,8 @@ import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.format.ODataFormat; -import org.apache.olingo.client.api.format.ODataPubFormat; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.format.ODataPubFormat; public class JSONTest extends AtomTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java index d950d2e5c..e3cbd7ec6 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PrimitiveValueTest.java @@ -32,7 +32,7 @@ import java.util.TimeZone; import java.util.UUID; import javax.xml.datatype.Duration; import org.apache.commons.codec.binary.Base64; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java index b42b5131d..dd49fecf7 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ServiceDocumentTest.java @@ -19,8 +19,8 @@ package org.apache.olingo.client.core.v3; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.core.AbstractTest; import static org.junit.Assert.assertNotNull; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java index d879e5b44..0fc9b18ac 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PrimitiveValueTest.java @@ -22,7 +22,7 @@ import java.util.Calendar; import static org.junit.Assert.assertEquals; import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.client.api.domain.ODataValue; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java index 7945692da..4dc4faec0 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ServiceDocumentTest.java @@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue; import java.net.URI; import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.client.api.domain.ODataServiceDocument; -import org.apache.olingo.client.api.format.ODataFormat; +import org.apache.olingo.commons.api.domain.ODataServiceDocument; +import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.core.AbstractTest; import org.junit.Test; diff --git a/lib/commons-api/pom.xml b/lib/commons-api/pom.xml index e398eaa88..4b7546933 100644 --- a/lib/commons-api/pom.xml +++ b/lib/commons-api/pom.xml @@ -39,6 +39,11 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> </dependencies> </project> diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/AbstractODataValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/AbstractODataValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java index 37ca0da2b..ab77d7fa8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/AbstractODataValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/AbstractODataValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataCollectionValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataCollectionValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java index df743df70..f5831871d 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataCollectionValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataCollectionValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.util.ArrayList; import java.util.Iterator; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataComplexValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataComplexValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java index d9b8a2478..b97371898 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataComplexValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataComplexValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java similarity index 99% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntity.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java index e06ca625a..6f84e4bf7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntity.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import java.util.ArrayList; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySet.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java index 22aff1fce..d3b146d99 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataEntitySet.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataEntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import java.util.ArrayList; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataGeospatialValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataGeospatialValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataGeospatialValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataGeospatialValue.java index af1c54532..756390719 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataGeospatialValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataGeospatialValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.olingo.commons.api.edm.EdmGeospatialType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntity.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java index 0d030e006..46e29dd2b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntity.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntitySet.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntitySet.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java index 331839c93..1ace20bc0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInlineEntitySet.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInlineEntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInvokeResult.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInvokeResult.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java index c55dfe66b..d4b8c44fd 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataInvokeResult.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataInvokeResult.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; /** * Marker interface for any OData domain object that can be returned by an operation invocation. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataItem.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataItem.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java index f427aa6b1..b40eeb785 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataItem.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataItem.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; import java.net.URI; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLink.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLink.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLink.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLink.java index 11005a7cf..9e6845427 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLink.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLink.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLinkType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLinkType.java similarity index 90% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLinkType.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLinkType.java index 6702c006e..59dc8348f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataLinkType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataLinkType.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.commons.lang3.StringUtils; -import org.apache.http.entity.ContentType; -import org.apache.olingo.client.api.format.ODataPubFormat; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.commons.api.format.ODataPubFormat; /** * OData link types. @@ -39,7 +39,7 @@ public enum ODataLinkType { /** * Association link. */ - ASSOCIATION(ContentType.APPLICATION_XML.getMimeType()), + ASSOCIATION(ContentType.APPLICATION_XML), /** * Media-edit link. */ @@ -59,7 +59,7 @@ public enum ODataLinkType { /** * Gets <code>LinkType</code> instance from the given rel and type. * - * @param client OData client. + * @param version OData protocol version. * @param rel rel. * @param type type. * @return <code>ODataLinkType</code> object. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataObjectFactory.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java similarity index 99% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataObjectFactory.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java index ddafea4cf..b38a5e8af 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataObjectFactory.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataObjectFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataOperation.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataOperation.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataOperation.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataOperation.java index c18260fd9..47daba496 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataOperation.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataOperation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; import java.net.URI; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPrimitiveValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPrimitiveValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPrimitiveValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPrimitiveValue.java index a615eed87..77e83ae48 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPrimitiveValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPrimitiveValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataProperty.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataProperty.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java index 440b461bd..721728286 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataProperty.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPropertyType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPropertyType.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java index 356596fea..d173e50bb 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataPropertyType.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataPropertyType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; public enum ODataPropertyType { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataServiceDocument.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataServiceDocument.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataServiceDocument.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataServiceDocument.java index d0f495dd3..13f807b92 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataServiceDocument.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataServiceDocument.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.net.URI; import java.util.Collection; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java index d56f18889..e1c9be99c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/domain/ODataValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.domain; +package org.apache.olingo.commons.api.domain; import java.io.Serializable; diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java new file mode 100644 index 000000000..21ed548c5 --- /dev/null +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ContentType.java @@ -0,0 +1,47 @@ +/* + * 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 + * + * 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. + */ +package org.apache.olingo.commons.api.format; + +public interface ContentType { + + public static final String APPLICATION_ATOM_XML = "application/atom+xml"; + + public static final String APPLICATION_FORM_URLENCODED = "application/x-www-form-urlencoded"; + + public static final String APPLICATION_JSON = "application/json"; + + public static final String APPLICATION_OCTET_STREAM = "application/octet-stream"; + + public static final String APPLICATION_SVG_XML = "application/svg+xml"; + + public static final String APPLICATION_XHTML_XML = "application/xhtml+xml"; + + public static final String APPLICATION_XML = "application/xml"; + + public static final String MULTIPART_FORM_DATA = "multipart/form-data"; + + public static final String TEXT_HTML = "text/html"; + + public static final String TEXT_PLAIN = "text/plain"; + + public static final String TEXT_XML = "text/xml"; + + public static final String WILDCARD = "*/*"; + +} diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java similarity index 82% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java index 2ee704b33..30d9e0946 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats to be used in various contexts. @@ -28,19 +26,19 @@ public enum ODataFormat { /** * JSON format with no metadata. */ - JSON_NO_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=nometadata"), + JSON_NO_METADATA(ContentType.APPLICATION_JSON + ";odata=nometadata"), /** * JSON format with minimal metadata (default). */ - JSON(ContentType.APPLICATION_JSON.getMimeType() + ";odata=minimalmetadata"), + JSON(ContentType.APPLICATION_JSON + ";odata=minimalmetadata"), /** * JSON format with no metadata. */ - JSON_FULL_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=fullmetadata"), + JSON_FULL_METADATA(ContentType.APPLICATION_JSON + ";odata=fullmetadata"), /** * XML format. */ - XML(ContentType.APPLICATION_XML.getMimeType()); + XML(ContentType.APPLICATION_XML); private final String format; @@ -71,7 +69,7 @@ public enum ODataFormat { final String[] parts = format.split(";"); _format.append(parts[0].trim()); - if (ContentType.APPLICATION_JSON.getMimeType().equals(parts[0].trim())) { + if (ContentType.APPLICATION_JSON.equals(parts[0].trim())) { if (parts.length > 1) { _format.append(';').append(parts[1].trim()); } else { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataMediaFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataMediaFormat.java similarity index 67% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataMediaFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataMediaFormat.java index 353edc440..c479de44c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataMediaFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataMediaFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats for media. @@ -27,18 +25,18 @@ public enum ODataMediaFormat { CHARSET_PARAMETER("charset"), MEDIA_TYPE_WILDCARD("*"), - WILDCARD("*/*"), - APPLICATION_XML(ContentType.APPLICATION_XML.getMimeType()), - APPLICATION_ATOM_XML(ContentType.APPLICATION_ATOM_XML.getMimeType()), - APPLICATION_XHTML_XML(ContentType.APPLICATION_XHTML_XML.getMimeType()), - APPLICATION_SVG_XML(ContentType.APPLICATION_SVG_XML.getMimeType()), - APPLICATION_JSON(ContentType.APPLICATION_JSON.getMimeType()), - APPLICATION_FORM_URLENCODED(ContentType.APPLICATION_FORM_URLENCODED.getMimeType()), - MULTIPART_FORM_DATA(ContentType.MULTIPART_FORM_DATA.getMimeType()), - APPLICATION_OCTET_STREAM(ContentType.APPLICATION_OCTET_STREAM.getMimeType()), - TEXT_PLAIN(ContentType.TEXT_PLAIN.getMimeType()), - TEXT_XML(ContentType.TEXT_XML.getMimeType()), - TEXT_HTML(ContentType.TEXT_HTML.getMimeType()); + WILDCARD(ContentType.WILDCARD), + APPLICATION_XML(ContentType.APPLICATION_XML), + APPLICATION_ATOM_XML(ContentType.APPLICATION_ATOM_XML), + APPLICATION_XHTML_XML(ContentType.APPLICATION_XHTML_XML), + APPLICATION_SVG_XML(ContentType.APPLICATION_SVG_XML), + APPLICATION_JSON(ContentType.APPLICATION_JSON), + APPLICATION_FORM_URLENCODED(ContentType.APPLICATION_FORM_URLENCODED), + MULTIPART_FORM_DATA(ContentType.MULTIPART_FORM_DATA), + APPLICATION_OCTET_STREAM(ContentType.APPLICATION_OCTET_STREAM), + TEXT_PLAIN(ContentType.TEXT_PLAIN), + TEXT_XML(ContentType.TEXT_XML), + TEXT_HTML(ContentType.TEXT_HTML); private final String format; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataPubFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataPubFormat.java similarity index 82% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataPubFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataPubFormat.java index 62e5322cd..6cd6a050f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataPubFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataPubFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats for AtomPub exchange. @@ -28,19 +26,19 @@ public enum ODataPubFormat { /** * JSON format with no metadata. */ - JSON_NO_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=nometadata"), + JSON_NO_METADATA(ContentType.APPLICATION_JSON + ";odata=nometadata"), /** * JSON format with minimal metadata (default). */ - JSON(ContentType.APPLICATION_JSON.getMimeType() + ";odata=minimalmetadata"), + JSON(ContentType.APPLICATION_JSON + ";odata=minimalmetadata"), /** * JSON format with no metadata. */ - JSON_FULL_METADATA(ContentType.APPLICATION_JSON.getMimeType() + ";odata=fullmetadata"), + JSON_FULL_METADATA(ContentType.APPLICATION_JSON + ";odata=fullmetadata"), /** * Atom format. */ - ATOM(ContentType.APPLICATION_ATOM_XML.getMimeType()); + ATOM(ContentType.APPLICATION_ATOM_XML); private final String format; @@ -71,7 +69,7 @@ public enum ODataPubFormat { final String[] parts = format.split(";"); _format.append(parts[0].trim()); - if (ContentType.APPLICATION_JSON.getMimeType().equals(parts[0].trim())) { + if (ContentType.APPLICATION_JSON.equals(parts[0].trim())) { if (parts.length > 1 && parts[1].startsWith("odata=")) { _format.append(';').append(parts[1].trim()); } else { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataValueFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataValueFormat.java similarity index 90% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataValueFormat.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataValueFormat.java index b04ce7d4b..1b290bf6e 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/format/ODataValueFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataValueFormat.java @@ -16,9 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.format; - -import org.apache.http.entity.ContentType; +package org.apache.olingo.commons.api.format; /** * Available formats for property values. @@ -28,11 +26,11 @@ public enum ODataValueFormat { /** * Application octet stream. */ - STREAM(ContentType.APPLICATION_OCTET_STREAM.getMimeType()), + STREAM(ContentType.APPLICATION_OCTET_STREAM), /** * Plain text format. */ - TEXT(ContentType.TEXT_PLAIN.getMimeType()); + TEXT(ContentType.TEXT_PLAIN); private final String format; From fa7a9ab80ef23f24628f0b702970d134baf3513f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org> Date: Mon, 24 Mar 2014 08:54:09 +0100 Subject: [PATCH 5/7] [OLINGO-200] ODataError was missing... --- .../client/api/communication/ODataClientErrorException.java | 2 +- .../apache/olingo/client/api/op/CommonODataDeserializer.java | 2 +- .../java/org/apache/olingo/client/api/op/CommonODataReader.java | 2 +- .../client/core/communication/request/ODataRequestImpl.java | 2 +- .../java/org/apache/olingo/client/core/data/JSONErrorImpl.java | 2 +- .../java/org/apache/olingo/client/core/data/XMLErrorImpl.java | 2 +- .../apache/olingo/client/core/op/AbstractODataDeserializer.java | 2 +- .../org/apache/olingo/client/core/op/AbstractODataReader.java | 2 +- .../test/java/org/apache/olingo/client/core/v3/ErrorTest.java | 2 +- .../java/org/apache/olingo/commons/api/domain}/ODataError.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename lib/{client-api/src/main/java/org/apache/olingo/client/api/data => commons-api/src/main/java/org/apache/olingo/commons/api/domain}/ODataError.java (97%) 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 e25fd6211..85ae888ee 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 @@ -25,7 +25,7 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.StatusLine; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; /** * Represents a client error in OData. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java index 0c0428ca5..6828b4489 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.api.op; import java.io.InputStream; import java.io.Serializable; import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java index 3f28f623c..829c5a79d 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataReader.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.api.op; import java.io.InputStream; import java.io.Serializable; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.commons.api.domain.ODataProperty; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java index 44f7c4540..b77b1b795 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java @@ -50,7 +50,7 @@ import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.data.JSONErrorImpl; import org.apache.olingo.client.core.data.XMLErrorImpl; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.client.core.communication.header.ODataHeadersImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.slf4j.Logger; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java index 583f438e6..53056958e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.core.data; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; /** * This class represents an OData error returned as JSON. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java index c5128f528..9e5b3c820 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java @@ -23,7 +23,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText; import java.util.Map; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; /** * This class represents an OData error returned as JSON. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java index 2b4385ec2..0f2ad2bf4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.op; import java.io.InputStream; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.client.api.data.Feed; import org.apache.olingo.client.api.data.Property; import org.apache.olingo.commons.api.format.ODataFormat; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java index b0869cf32..abc107006 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java @@ -21,7 +21,7 @@ package org.apache.olingo.client.core.op; import java.io.InputStream; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.client.api.data.Property; import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.commons.api.domain.ODataEntitySet; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java index 57f35164a..0b10d51c5 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/ErrorTest.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.data.ODataError; +import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; import org.junit.Test; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ODataError.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/ODataError.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java index eab263b4e..29939643c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ODataError.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataError.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.domain; /** * OData error. From fac84b3eb6a9c84c6133095dfb0d3cd73da6b579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org> Date: Mon, 24 Mar 2014 09:36:44 +0100 Subject: [PATCH 6/7] [OLINGO-200] Moving Atom and JSON (de)serializer to commons --- .../api/domain/ODataEntitySetIterator.java | 4 +-- .../client/api/op/CommonODataBinder.java | 8 ++--- .../api/op/CommonODataDeserializer.java | 6 ++-- .../olingo/client/api/op/ODataSerializer.java | 8 ++--- .../olingo/client/api/op/v3/ODataBinder.java | 2 +- .../client/api/op/v3/ODataDeserializer.java | 2 +- lib/client-core/pom.xml | 21 ----------- .../client/core/AbstractODataClient.java | 2 +- .../request/ODataRequestImpl.java | 4 +-- .../request/batch/ODataBatchUtilities.java | 2 +- .../batch/ODataBatchResponseManager.java | 2 +- .../data/JSONServiceDocumentDeserializer.java | 5 +-- .../data/XMLServiceDocumentDeserializer.java | 3 +- .../core/data/v3/JSONServiceDocumentImpl.java | 4 +-- .../core/data/v4/JSONServiceDocumentImpl.java | 4 +-- .../core/domain/ODataPrimitiveValueImpl.java | 2 +- .../client/core/edm/EdmActionImportImpl.java | 2 +- .../olingo/client/core/edm/EdmClientImpl.java | 1 + .../client/core/edm/EdmComplexTypeImpl.java | 1 + .../core/edm/EdmEntityContainerImpl.java | 1 + .../client/core/edm/EdmEntityTypeImpl.java | 1 + .../core/edm/EdmFunctionImportImpl.java | 1 + .../core/edm/EdmNavigationPropertyImpl.java | 1 + .../client/core/edm/EdmParameterImpl.java | 1 + .../client/core/edm/EdmPropertyImpl.java | 1 + .../client/core/edm/EdmReturnTypeImpl.java | 1 + .../core/edm/v3/EdmActionImportProxy.java | 2 +- .../core/edm/v3/EdmFunctionImportProxy.java | 2 +- .../core/edm/xml/AbstractEdmDeserializer.java | 8 ++--- .../core/edm/xml/ComplexTypeDeserializer.java | 2 +- .../edm/xml/DataServicesDeserializer.java | 2 +- .../client/core/edm/xml/EdmxDeserializer.java | 2 +- .../edm/xml/EntityContainerDeserializer.java | 2 +- .../core/edm/xml/EntitySetDeserializer.java | 2 +- .../core/edm/xml/EntityTypeDeserializer.java | 2 +- .../core/edm/xml/EnumTypeDeserializer.java | 2 +- .../core/edm/xml/ParameterDeserializer.java | 2 +- .../core/edm/xml/PropertyDeserializer.java | 2 +- .../core/edm/xml/SchemaDeserializer.java | 20 +++++------ .../client/core/op/AbstractJacksonTool.java | 16 ++++----- .../client/core/op/AbstractODataBinder.java | 26 +++++++------- .../core/op/AbstractODataDeserializer.java | 32 ++++++++--------- .../client/core/op/AbstractODataReader.java | 2 +- .../core/op/AbstractODataSerializer.java | 32 ++++++++--------- .../core/op/ODataObjectFactoryImpl.java | 35 +++++++++---------- .../client/core/op/ResourceFactory.java | 18 +++++----- .../core/op/impl/v3/ODataBinderImpl.java | 2 +- .../op/impl/v3/ODataDeserializerImpl.java | 12 +++---- .../core/op/impl/v3/ODataSerializerImpl.java | 6 ++-- .../op/impl/v4/ODataDeserializerImpl.java | 6 ++-- .../core/op/impl/v4/ODataSerializerImpl.java | 6 ++-- .../olingo/client/core/uri/URIUtils.java | 2 +- .../client/core/v3/ODataClientImpl.java | 4 +-- .../client/core/v4/ODataClientImpl.java | 4 +-- .../client/core/AbstractPrimitiveTest.java | 2 +- .../client/core/AtomLinksQualifier.java | 2 +- .../client/core/it/AbstractTestITCase.java | 8 ++--- .../core/it/v3/QueryOptionsTestITCase.java | 4 +-- .../olingo/client/core/v3/JSONTest.java | 2 +- .../apache/olingo/commons}/api/Constants.java | 4 ++- .../commons}/api/data/CollectionValue.java | 2 +- .../commons}/api/data/ComplexValue.java | 2 +- .../olingo/commons}/api/data/Entry.java | 2 +- .../apache/olingo/commons}/api/data/Feed.java | 2 +- .../olingo/commons}/api/data/GeoUtils.java | 4 +-- .../commons}/api/data/GeospatialValue.java | 2 +- .../apache/olingo/commons}/api/data/Link.java | 2 +- .../olingo/commons}/api/data/NullValue.java | 2 +- .../commons}/api/data/PrimitiveValue.java | 2 +- .../olingo/commons}/api/data/Property.java | 2 +- .../olingo/commons}/api/data/Value.java | 2 +- .../commons}/api/data/v3/LinkCollection.java | 2 +- lib/commons-core/pom.xml | 21 +++++++++++ .../core/data/AbstractAtomDealer.java | 4 +-- .../core/data/AbstractAtomObject.java | 2 +- .../commons}/core/data/AbstractEntry.java | 8 ++--- .../core/data/AbstractJsonDeserializer.java | 14 ++++---- .../core/data/AbstractJsonSerializer.java | 10 +++--- .../core/data/AbstractPayloadObject.java | 2 +- .../core/data/AbstractPropertyImpl.java | 6 ++-- .../commons}/core/data/AbstractValue.java | 14 ++++---- .../commons}/core/data/AtomDeserializer.java | 10 +++--- .../commons}/core/data/AtomEntryImpl.java | 2 +- .../commons}/core/data/AtomFeedImpl.java | 6 ++-- .../core/data/AtomGeoValueDeserializer.java | 6 ++-- .../core/data/AtomGeoValueSerializer.java | 4 +-- .../core/data/AtomPropertyDeserializer.java | 12 +++---- .../commons}/core/data/AtomPropertyImpl.java | 2 +- .../core/data/AtomPropertySerializer.java | 10 +++--- .../commons}/core/data/AtomSerializer.java | 16 ++++----- .../core/data/CollectionValueImpl.java | 6 ++-- .../commons}/core/data/ComplexValueImpl.java | 6 ++-- .../core/data/GeospatialValueImpl.java | 4 +-- .../core/data/JSONEntryDeserializer.java | 15 ++++---- .../commons}/core/data/JSONEntryImpl.java | 6 ++-- .../core/data/JSONEntrySerializer.java | 12 +++---- .../commons}/core/data/JSONErrorBundle.java | 2 +- .../commons}/core/data/JSONErrorImpl.java | 2 +- .../core/data/JSONFeedDeserializer.java | 4 +-- .../commons}/core/data/JSONFeedImpl.java | 10 +++--- .../core/data/JSONFeedSerializer.java | 6 ++-- .../core/data/JSONGeoValueDeserializer.java | 8 ++--- .../core/data/JSONGeoValueSerializer.java | 4 +-- .../core/data/JSONPropertyDeserializer.java | 4 +-- .../commons}/core/data/JSONPropertyImpl.java | 2 +- .../core/data/JSONPropertySerializer.java | 6 ++-- .../olingo/commons}/core/data/LinkImpl.java | 8 ++--- .../commons}/core/data/NullValueImpl.java | 4 +-- .../core/data/ODataJacksonDeserializer.java | 11 +++--- .../core/data/ODataJacksonSerializer.java | 10 +++--- .../core/data/PrimitiveValueImpl.java | 4 +-- .../commons}/core/data/XMLErrorImpl.java | 2 +- .../core/data/v3/JSONLinkCollectionImpl.java | 6 ++-- .../core/data/v3/XMLLinkCollectionImpl.java | 4 +-- .../olingo/commons}/core/edm/EdmTypeInfo.java | 2 +- 115 files changed, 346 insertions(+), 342 deletions(-) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/Constants.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/CollectionValue.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/ComplexValue.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/Entry.java (98%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/Feed.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/GeoUtils.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/GeospatialValue.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/Link.java (97%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/NullValue.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/PrimitiveValue.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/Property.java (95%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/Value.java (96%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/data/v3/LinkCollection.java (96%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractAtomDealer.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractAtomObject.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractEntry.java (94%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractJsonDeserializer.java (93%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractJsonSerializer.java (93%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractPayloadObject.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractPropertyImpl.java (93%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AbstractValue.java (85%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomDeserializer.java (98%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomEntryImpl.java (95%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomFeedImpl.java (91%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomGeoValueDeserializer.java (98%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomGeoValueSerializer.java (98%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomPropertyDeserializer.java (95%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomPropertyImpl.java (95%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomPropertySerializer.java (92%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/AtomSerializer.java (96%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/CollectionValueImpl.java (88%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/ComplexValueImpl.java (88%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/GeospatialValueImpl.java (92%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONEntryDeserializer.java (94%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONEntryImpl.java (94%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONEntrySerializer.java (92%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONErrorBundle.java (96%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONErrorImpl.java (99%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONFeedDeserializer.java (96%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONFeedImpl.java (91%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONFeedSerializer.java (93%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONGeoValueDeserializer.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONGeoValueSerializer.java (98%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONPropertyDeserializer.java (96%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONPropertyImpl.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/JSONPropertySerializer.java (93%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/LinkImpl.java (92%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/NullValueImpl.java (91%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/ODataJacksonDeserializer.java (79%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/ODataJacksonSerializer.java (81%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/PrimitiveValueImpl.java (91%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/XMLErrorImpl.java (99%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/v3/JSONLinkCollectionImpl.java (94%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/data/v3/XMLLinkCollectionImpl.java (93%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/edm/EdmTypeInfo.java (99%) 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/ODataEntitySetIterator.java index 8c1db4d49..9d720bf42 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/ODataEntitySetIterator.java @@ -29,8 +29,8 @@ import java.util.NoSuchElementException; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.Entry; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Entry; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.commons.api.domain.ODataEntitySet; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java index 8dd723226..38fe16f56 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataBinder.java @@ -20,10 +20,10 @@ package org.apache.olingo.client.api.op; import java.io.Serializable; import java.net.URI; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Link; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.commons.api.domain.ODataEntitySet; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java index 6828b4489..5b01fa3d0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java @@ -20,10 +20,10 @@ package org.apache.olingo.client.api.op; import java.io.InputStream; import java.io.Serializable; -import org.apache.olingo.client.api.data.Entry; +import org.apache.olingo.commons.api.data.Entry; import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.commons.api.format.ODataFormat; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java index 0734586d3..811a07b1c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java @@ -21,10 +21,10 @@ package org.apache.olingo.client.api.op; import java.io.OutputStream; import java.io.Serializable; import java.io.Writer; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Link; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.format.ODataFormat; /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataBinder.java index 118a002b6..6ea90ba0f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataBinder.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataBinder.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.api.op.v3; -import org.apache.olingo.client.api.data.v3.LinkCollection; +import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; import org.apache.olingo.client.api.op.CommonODataBinder; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java index 99d840da8..6c7a2bbdb 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.api.op.v3; import java.io.InputStream; -import org.apache.olingo.client.api.data.v3.LinkCollection; +import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.CommonODataDeserializer; diff --git a/lib/client-core/pom.xml b/lib/client-core/pom.xml index 9c5228581..6039cfd1b 100644 --- a/lib/client-core/pom.xml +++ b/lib/client-core/pom.xml @@ -45,27 +45,6 @@ <artifactId>olingo-commons-core-incubating</artifactId> <version>${project.version}</version> </dependency> - - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-annotations</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-xml</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml</groupId> - <artifactId>aalto-xml</artifactId> - </dependency> <dependency> <groupId>junit</groupId> diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java index 6c889e818..b5603fc5b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java @@ -32,7 +32,7 @@ public abstract class AbstractODataClient implements CommonODataClient { private final ODataWriter writer = new ODataWriterImpl(this); - private final ODataObjectFactory objectFactory = new ODataObjectFactoryImpl(this); + private final ODataObjectFactory objectFactory = new ODataObjectFactoryImpl(getServiceVersion()); @Override public ODataPrimitiveValueImpl.BuilderImpl getPrimitiveValueBuilder() { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java index b77b1b795..bec2f6587 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java @@ -48,8 +48,8 @@ import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.commons.api.format.ODataValueFormat; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.client.core.data.JSONErrorImpl; -import org.apache.olingo.client.core.data.XMLErrorImpl; +import org.apache.olingo.commons.core.data.JSONErrorImpl; +import org.apache.olingo.commons.core.data.XMLErrorImpl; import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.client.core.communication.header.ODataHeadersImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java index a33f7cb35..7474e136d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataBatchUtilities.java @@ -32,7 +32,7 @@ import java.util.regex.Pattern; import org.apache.commons.io.IOUtils; import org.apache.commons.io.LineIterator; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.client.api.ODataBatchConstants; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.ODataStreamer; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java index a8cfd2ddc..136e1c151 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchResponseManager.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.Map; import java.util.NoSuchElementException; import org.apache.commons.io.IOUtils; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java index 4a6ebc0a6..143aed88d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java @@ -28,8 +28,9 @@ import java.io.IOException; import java.util.Iterator; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.core.data.ODataJacksonDeserializer; public class JSONServiceDocumentDeserializer extends ODataJacksonDeserializer<AbstractServiceDocument> { @@ -39,7 +40,7 @@ public class JSONServiceDocumentDeserializer extends ODataJacksonDeserializer<Ab final ObjectNode tree = (ObjectNode) parser.getCodec().readTree(parser); - final AbstractServiceDocument serviceDocument = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractServiceDocument serviceDocument = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.data.v3.JSONServiceDocumentImpl() : new org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java index da2017f35..ef62f1363 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentDeserializer.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.data; +import org.apache.olingo.commons.core.data.ODataJacksonDeserializer; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonToken; @@ -69,7 +70,7 @@ public class XMLServiceDocumentDeserializer extends ODataJacksonDeserializer<Ser protected ServiceDocument doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractServiceDocument sdoc = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractServiceDocument sdoc = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.data.v3.XMLServiceDocumentImpl() : new org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/JSONServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/JSONServiceDocumentImpl.java index 659e91c07..ace54876a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/JSONServiceDocumentImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/JSONServiceDocumentImpl.java @@ -22,9 +22,9 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.net.URI; -import org.apache.olingo.client.api.uri.SegmentType; import org.apache.olingo.client.core.data.AbstractServiceDocument; import org.apache.olingo.client.core.data.JSONServiceDocumentDeserializer; +import org.apache.olingo.commons.api.Constants; /** * Service document, represented via JSON. @@ -41,7 +41,7 @@ public class JSONServiceDocumentImpl extends AbstractServiceDocument { URI baseURI = null; if (metadata != null) { final String metadataURI = getMetadata(); - baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue()))); + baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(Constants.METADATA))); } return baseURI; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/JSONServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/JSONServiceDocumentImpl.java index 23ed64ce0..b5c352be2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/JSONServiceDocumentImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/JSONServiceDocumentImpl.java @@ -19,12 +19,12 @@ package org.apache.olingo.client.core.data.v4; import org.apache.olingo.client.api.data.ServiceDocument; -import org.apache.olingo.client.api.uri.SegmentType; import org.apache.olingo.client.core.data.JSONServiceDocumentDeserializer; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import java.net.URI; +import org.apache.olingo.commons.api.Constants; @JsonDeserialize(using = JSONServiceDocumentDeserializer.class) public class JSONServiceDocumentImpl extends AbstractServiceDocument implements ServiceDocument { @@ -34,7 +34,7 @@ public class JSONServiceDocumentImpl extends AbstractServiceDocument implements URI baseURI = null; if (getMetadataContext() != null) { final String metadataURI = getMetadataContext(); - baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue()))); + baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(Constants.METADATA))); } return baseURI; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java index aac8ee389..a15dd7683 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/domain/ODataPrimitiveValueImpl.java @@ -22,7 +22,7 @@ import java.sql.Timestamp; import java.util.Calendar; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.domain.AbstractODataValue; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java index 382741807..ae64d31d1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmActionImportImpl.java @@ -19,7 +19,7 @@ package org.apache.olingo.client.core.edm; import org.apache.olingo.client.api.edm.xml.v4.ActionImport; -import org.apache.olingo.client.core.edm.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java index 948a930c9..573e2bc0b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmClientImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import java.util.ArrayList; import java.util.HashMap; import java.util.HashSet; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java index 43f5357d7..9ecc5116f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmComplexTypeImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import java.util.Map; import org.apache.olingo.client.api.edm.xml.ComplexType; import org.apache.olingo.commons.api.edm.Edm; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java index 03385f80b..635b752e7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityContainerImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import java.util.List; import org.apache.olingo.client.api.v3.UnsupportedInV3Exception; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java index 914ad1c92..c5637e7c3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEntityTypeImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import java.util.ArrayList; import java.util.List; import java.util.Map; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java index 27d6d1080..138c2ac3a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmFunctionImportImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.FunctionImport; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java index 19df6205d..44e723e3a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmNavigationPropertyImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java index e912ecb71..6c717093e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmParameterImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.client.api.edm.xml.CommonParameter; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmMapping; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java index 8e3eba664..9c9b4f63b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmPropertyImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.client.api.edm.xml.CommonProperty; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmMapping; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java index b559c7190..71a10099c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReturnTypeImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.client.api.edm.xml.v4.ReturnType; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.core.edm.AbstractEdmReturnType; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmActionImportProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmActionImportProxy.java index 32429c0d2..8b7496fc3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmActionImportProxy.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmActionImportProxy.java @@ -20,7 +20,7 @@ package org.apache.olingo.client.core.edm.v3; import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; import org.apache.olingo.client.core.edm.EdmOperationImportImpl; -import org.apache.olingo.client.core.edm.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java index 90364a889..9014c4ab5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmFunctionImportProxy.java @@ -22,7 +22,7 @@ import java.util.List; import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; import org.apache.olingo.client.core.edm.EdmOperationImportImpl; -import org.apache.olingo.client.core.edm.EdmTypeInfo; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmFunction; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmDeserializer.java index c3ff9c442..e21436f75 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmDeserializer.java @@ -26,13 +26,13 @@ import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser; import java.io.IOException; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.core.edm.xml.v4.ReturnTypeImpl; import org.apache.olingo.client.core.edm.xml.v4.annotation.ConstExprConstructImpl; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public abstract class AbstractEdmDeserializer<T> extends JsonDeserializer<T> { - protected CommonODataClient client; + protected ODataServiceVersion version; protected boolean isAnnotationConstExprConstruct(final JsonParser jp) throws IOException { return ConstExprConstructImpl.Type.fromString(jp.getCurrentName()) != null; @@ -52,7 +52,7 @@ public abstract class AbstractEdmDeserializer<T> extends JsonDeserializer<T> { returnType.setType(jp.nextTextValue()); } else { jp.nextToken(); - returnType = jp.readValueAs( ReturnTypeImpl.class); + returnType = jp.readValueAs(ReturnTypeImpl.class); } return returnType; } @@ -64,7 +64,7 @@ public abstract class AbstractEdmDeserializer<T> extends JsonDeserializer<T> { public T deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - client = (CommonODataClient) ctxt.findInjectableValue(CommonODataClient.class.getName(), null, null); + version = (ODataServiceVersion) ctxt.findInjectableValue(ODataServiceVersion.class.getName(), null, null); return doDeserialize(jp, ctxt); } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ComplexTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ComplexTypeDeserializer.java index c9730cbca..ea62ba468 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ComplexTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ComplexTypeDeserializer.java @@ -35,7 +35,7 @@ public class ComplexTypeDeserializer extends AbstractEdmDeserializer<AbstractCom protected AbstractComplexType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractComplexType complexType = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractComplexType complexType = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.ComplexTypeImpl() : new org.apache.olingo.client.core.edm.xml.v4.ComplexTypeImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java index ef2e2013c..c94c0494f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/DataServicesDeserializer.java @@ -33,7 +33,7 @@ public class DataServicesDeserializer extends AbstractEdmDeserializer<AbstractDa protected AbstractDataServices doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractDataServices dataServices = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractDataServices dataServices = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.DataServicesImpl() : new org.apache.olingo.client.core.edm.xml.v4.DataServicesImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java index f617d5ba3..1e3de6f19 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EdmxDeserializer.java @@ -34,7 +34,7 @@ public class EdmxDeserializer extends AbstractEdmDeserializer<AbstractEdmx> { protected AbstractEdmx doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractEdmx edmx = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractEdmx edmx = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.EdmxImpl() : new org.apache.olingo.client.core.edm.xml.v4.EdmxImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java index 67735a820..f6263659d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityContainerDeserializer.java @@ -39,7 +39,7 @@ public class EntityContainerDeserializer extends AbstractEdmDeserializer<Abstrac protected AbstractEntityContainer doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractEntityContainer entityContainer = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractEntityContainer entityContainer = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.EntityContainerImpl() : new org.apache.olingo.client.core.edm.xml.v4.EntityContainerImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java index 861ea2fd6..c71f4de1e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java @@ -36,7 +36,7 @@ public class EntitySetDeserializer extends AbstractEdmDeserializer<AbstractEntit protected AbstractEntitySet doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractEntitySet entitySet = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractEntitySet entitySet = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.EntitySetImpl() : new org.apache.olingo.client.core.edm.xml.v4.EntitySetImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityTypeDeserializer.java index 8f3c60d10..a55a9e050 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntityTypeDeserializer.java @@ -35,7 +35,7 @@ public class EntityTypeDeserializer extends AbstractEdmDeserializer<AbstractEnti protected AbstractEntityType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractEntityType entityType = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractEntityType entityType = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.EntityTypeImpl() : new org.apache.olingo.client.core.edm.xml.v4.EntityTypeImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeDeserializer.java index 9c99ea286..7a8f888db 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeDeserializer.java @@ -35,7 +35,7 @@ public class EnumTypeDeserializer extends AbstractEdmDeserializer<AbstractEnumTy protected AbstractEnumType doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractEnumType enumType = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractEnumType enumType = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.EnumTypeImpl() : new org.apache.olingo.client.core.edm.xml.v4.EnumTypeImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java index 2aa3cddcb..68baf15ce 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/ParameterDeserializer.java @@ -35,7 +35,7 @@ public class ParameterDeserializer extends AbstractEdmDeserializer<AbstractParam protected AbstractParameter doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractParameter parameter = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractParameter parameter = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.ParameterImpl() : new org.apache.olingo.client.core.edm.xml.v4.ParameterImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java index 8815e44a2..4b6c2bde9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyDeserializer.java @@ -38,7 +38,7 @@ public class PropertyDeserializer extends AbstractEdmDeserializer<AbstractProper protected AbstractProperty doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractProperty property = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractProperty property = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.PropertyImpl() : new org.apache.olingo.client.core.edm.xml.v4.PropertyImpl(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java index afa0a84ac..abdfa3349 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/SchemaDeserializer.java @@ -41,7 +41,7 @@ public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> protected AbstractSchema doDeserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - final AbstractSchema schema = ODataServiceVersion.V30 == client.getServiceVersion() + final AbstractSchema schema = ODataServiceVersion.V30 == version ? new org.apache.olingo.client.core.edm.xml.v3.SchemaImpl() : new org.apache.olingo.client.core.edm.xml.v4.SchemaImpl(); @@ -55,11 +55,11 @@ public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> } else if ("Using".equals(jp.getCurrentName())) { jp.nextToken(); ((org.apache.olingo.client.core.edm.xml.v3.SchemaImpl) schema). - getUsings().add(jp.readValueAs( UsingImpl.class)); + getUsings().add(jp.readValueAs(UsingImpl.class)); } else if ("Association".equals(jp.getCurrentName())) { jp.nextToken(); ((org.apache.olingo.client.core.edm.xml.v3.SchemaImpl) schema). - getAssociations().add(jp.readValueAs( AssociationImpl.class)); + getAssociations().add(jp.readValueAs(AssociationImpl.class)); } else if ("ComplexType".equals(jp.getCurrentName())) { jp.nextToken(); if (schema instanceof org.apache.olingo.client.core.edm.xml.v3.SchemaImpl) { @@ -96,7 +96,7 @@ public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> } else if ("ValueTerm".equals(jp.getCurrentName())) { jp.nextToken(); ((org.apache.olingo.client.core.edm.xml.v3.SchemaImpl) schema). - getValueTerms().add(jp.readValueAs( ValueTermImpl.class)); + getValueTerms().add(jp.readValueAs(ValueTermImpl.class)); } else if ("EntityContainer".equals(jp.getCurrentName())) { jp.nextToken(); @@ -105,8 +105,8 @@ public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> getEntityContainers().add(jp.readValueAs( org.apache.olingo.client.core.edm.xml.v3.EntityContainerImpl.class)); } else { - org.apache.olingo.client.core.edm.xml.v4.EntityContainerImpl entityContainer - = jp.readValueAs( + org.apache.olingo.client.core.edm.xml.v4.EntityContainerImpl entityContainer = + jp.readValueAs( org.apache.olingo.client.core.edm.xml.v4.EntityContainerImpl.class); entityContainer.setDefaultEntityContainer(true); ((org.apache.olingo.client.core.edm.xml.v4.SchemaImpl) schema). @@ -126,19 +126,19 @@ public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> } else if ("Action".equals(jp.getCurrentName())) { jp.nextToken(); ((org.apache.olingo.client.core.edm.xml.v4.SchemaImpl) schema).getActions(). - add(jp.readValueAs( ActionImpl.class)); + add(jp.readValueAs(ActionImpl.class)); } else if ("Annotation".equals(jp.getCurrentName())) { jp.nextToken(); ((org.apache.olingo.client.core.edm.xml.v4.SchemaImpl) schema).getAnnotations(). - add(jp.readValueAs( AnnotationImpl.class)); + add(jp.readValueAs(AnnotationImpl.class)); } else if ("Function".equals(jp.getCurrentName())) { jp.nextToken(); ((org.apache.olingo.client.core.edm.xml.v4.SchemaImpl) schema).getFunctions(). - add(jp.readValueAs( FunctionImpl.class)); + add(jp.readValueAs(FunctionImpl.class)); } else if ("TypeDefinition".equals(jp.getCurrentName())) { jp.nextToken(); ((org.apache.olingo.client.core.edm.xml.v4.SchemaImpl) schema). - getTypeDefinitions().add(jp.readValueAs( TypeDefinitionImpl.class)); + getTypeDefinitions().add(jp.readValueAs(TypeDefinitionImpl.class)); } } } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java index 901b17528..2d62a7d02 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java @@ -31,10 +31,8 @@ import com.fasterxml.jackson.databind.deser.DeserializationProblemHandler; import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule; import com.fasterxml.jackson.dataformat.xml.XmlFactory; import com.fasterxml.jackson.dataformat.xml.XmlMapper; - import java.io.IOException; - -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -42,19 +40,19 @@ abstract class AbstractJacksonTool { protected static final Logger LOG = LoggerFactory.getLogger(AbstractJacksonTool.class); - protected final CommonODataClient client; + protected final ODataServiceVersion version; - protected AbstractJacksonTool(final CommonODataClient client) { - this.client = client; + protected AbstractJacksonTool(final ODataServiceVersion client) { + this.version = client; } protected ObjectMapper getObjectMapper() { final ObjectMapper mapper = new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL); - mapper.setInjectableValues(new InjectableValues.Std().addValue(CommonODataClient.class, client)); + mapper.setInjectableValues(new InjectableValues.Std().addValue(ODataServiceVersion.class, version)); mapper.setSerializerProvider(new InjectableSerializerProvider(mapper.getSerializerProvider(), - mapper.getSerializationConfig().withAttribute(CommonODataClient.class, client), + mapper.getSerializationConfig().withAttribute(ODataServiceVersion.class, version), mapper.getSerializerFactory())); return mapper; @@ -64,7 +62,7 @@ abstract class AbstractJacksonTool { final XmlMapper xmlMapper = new XmlMapper( new XmlFactory(new InputFactoryImpl(), new OutputFactoryImpl()), new JacksonXmlModule()); - xmlMapper.setInjectableValues(new InjectableValues.Std().addValue(CommonODataClient.class, client)); + xmlMapper.setInjectableValues(new InjectableValues.Std().addValue(ODataServiceVersion.class, version)); xmlMapper.addHandler(new DeserializationProblemHandler() { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java index 4e53ce3e9..d2e9eded3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java @@ -23,14 +23,14 @@ import java.net.URI; import java.util.Iterator; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Link; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.ServiceDocumentItem; -import org.apache.olingo.client.api.data.Value; +import org.apache.olingo.commons.api.data.Value; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.ODataEntity; @@ -44,13 +44,13 @@ import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.CommonODataBinder; -import org.apache.olingo.client.core.data.CollectionValueImpl; -import org.apache.olingo.client.core.data.ComplexValueImpl; -import org.apache.olingo.client.core.data.GeospatialValueImpl; -import org.apache.olingo.client.core.data.JSONPropertyImpl; -import org.apache.olingo.client.core.data.LinkImpl; -import org.apache.olingo.client.core.data.NullValueImpl; -import org.apache.olingo.client.core.data.PrimitiveValueImpl; +import org.apache.olingo.commons.core.data.CollectionValueImpl; +import org.apache.olingo.commons.core.data.ComplexValueImpl; +import org.apache.olingo.commons.core.data.GeospatialValueImpl; +import org.apache.olingo.commons.core.data.JSONPropertyImpl; +import org.apache.olingo.commons.core.data.LinkImpl; +import org.apache.olingo.commons.core.data.NullValueImpl; +import org.apache.olingo.commons.core.data.PrimitiveValueImpl; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.slf4j.Logger; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java index 0f2ad2bf4..ed49ca8b8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java @@ -19,23 +19,23 @@ package org.apache.olingo.client.core.op; import java.io.InputStream; -import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.data.Entry; +import org.apache.olingo.commons.api.data.Entry; import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.op.CommonODataDeserializer; -import org.apache.olingo.client.core.data.AtomDeserializer; -import org.apache.olingo.client.core.data.AtomEntryImpl; -import org.apache.olingo.client.core.data.AtomFeedImpl; -import org.apache.olingo.client.core.data.AtomPropertyImpl; -import org.apache.olingo.client.core.data.JSONEntryImpl; -import org.apache.olingo.client.core.data.JSONErrorBundle; -import org.apache.olingo.client.core.data.JSONFeedImpl; -import org.apache.olingo.client.core.data.JSONPropertyImpl; -import org.apache.olingo.client.core.data.XMLErrorImpl; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.core.data.AtomDeserializer; +import org.apache.olingo.commons.core.data.AtomEntryImpl; +import org.apache.olingo.commons.core.data.AtomFeedImpl; +import org.apache.olingo.commons.core.data.AtomPropertyImpl; +import org.apache.olingo.commons.core.data.JSONEntryImpl; +import org.apache.olingo.commons.core.data.JSONErrorBundle; +import org.apache.olingo.commons.core.data.JSONFeedImpl; +import org.apache.olingo.commons.core.data.JSONPropertyImpl; +import org.apache.olingo.commons.core.data.XMLErrorImpl; public abstract class AbstractODataDeserializer extends AbstractJacksonTool implements CommonODataDeserializer { @@ -43,10 +43,10 @@ public abstract class AbstractODataDeserializer extends AbstractJacksonTool impl private final AtomDeserializer atomDeserializer; - public AbstractODataDeserializer(final CommonODataClient client) { - super(client); + public AbstractODataDeserializer(final ODataServiceVersion version) { + super(version); - this.atomDeserializer = new AtomDeserializer(client.getServiceVersion()); + this.atomDeserializer = new AtomDeserializer(version); } @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java index abc107006..55b0d5749 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataReader.java @@ -22,7 +22,7 @@ import java.io.InputStream; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.commons.api.domain.ODataError; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.client.api.domain.ODataEntitySetIterator; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java index 7a1a01534..c31413927 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java @@ -24,21 +24,21 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Link; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.ODataSerializer; -import org.apache.olingo.client.core.data.AtomEntryImpl; -import org.apache.olingo.client.core.data.AtomFeedImpl; -import org.apache.olingo.client.core.data.AtomPropertyImpl; -import org.apache.olingo.client.core.data.AtomSerializer; -import org.apache.olingo.client.core.data.JSONEntryImpl; -import org.apache.olingo.client.core.data.JSONFeedImpl; -import org.apache.olingo.client.core.data.JSONPropertyImpl; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.core.data.AtomEntryImpl; +import org.apache.olingo.commons.core.data.AtomFeedImpl; +import org.apache.olingo.commons.core.data.AtomPropertyImpl; +import org.apache.olingo.commons.core.data.AtomSerializer; +import org.apache.olingo.commons.core.data.JSONEntryImpl; +import org.apache.olingo.commons.core.data.JSONFeedImpl; +import org.apache.olingo.commons.core.data.JSONPropertyImpl; public abstract class AbstractODataSerializer extends AbstractJacksonTool implements ODataSerializer { @@ -46,10 +46,10 @@ public abstract class AbstractODataSerializer extends AbstractJacksonTool implem private final AtomSerializer atomSerializer; - public AbstractODataSerializer(final CommonODataClient client) { - super(client); + public AbstractODataSerializer(final ODataServiceVersion version) { + super(version); - this.atomSerializer = new AtomSerializer(client.getServiceVersion()); + this.atomSerializer = new AtomSerializer(version); } @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java index a7bf76d58..e5e7aa3aa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.op; import java.net.URI; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.commons.api.domain.ODataLinkType; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; @@ -32,15 +31,16 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.domain.ODataObjectFactory; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.ODataProperty; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataObjectFactoryImpl implements ODataObjectFactory { private static final long serialVersionUID = -3769695665946919447L; - protected final CommonODataClient client; + protected final ODataServiceVersion version; - public ODataObjectFactoryImpl(final CommonODataClient client) { - this.client = client; + public ODataObjectFactoryImpl(final ODataServiceVersion version) { + this.version = version; } @Override @@ -69,76 +69,73 @@ public class ODataObjectFactoryImpl implements ODataObjectFactory { public ODataInlineEntitySet newInlineEntitySet(final String name, final URI link, final ODataEntitySet entitySet) { - return new ODataInlineEntitySet(client.getServiceVersion(), - link, ODataLinkType.ENTITY_SET_NAVIGATION, name, entitySet); + return new ODataInlineEntitySet(version, link, ODataLinkType.ENTITY_SET_NAVIGATION, name, entitySet); } @Override public ODataInlineEntitySet newInlineEntitySet(final String name, final URI baseURI, final String href, final ODataEntitySet entitySet) { - return new ODataInlineEntitySet(client.getServiceVersion(), - baseURI, href, ODataLinkType.ENTITY_SET_NAVIGATION, name, entitySet); + return new ODataInlineEntitySet(version, baseURI, href, ODataLinkType.ENTITY_SET_NAVIGATION, name, entitySet); } @Override public ODataInlineEntity newInlineEntity(final String name, final URI link, final ODataEntity entity) { - return new ODataInlineEntity(client.getServiceVersion(), link, ODataLinkType.ENTITY_NAVIGATION, name, entity); + return new ODataInlineEntity(version, link, ODataLinkType.ENTITY_NAVIGATION, name, entity); } @Override public ODataInlineEntity newInlineEntity(final String name, final URI baseURI, final String href, final ODataEntity entity) { - return new ODataInlineEntity(client.getServiceVersion(), - baseURI, href, ODataLinkType.ENTITY_NAVIGATION, name, entity); + return new ODataInlineEntity(version, baseURI, href, ODataLinkType.ENTITY_NAVIGATION, name, entity); } @Override public ODataLink newEntityNavigationLink(final String name, final URI link) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(link). + return new ODataLink.Builder().setVersion(version).setURI(link). setType(ODataLinkType.ENTITY_NAVIGATION).setTitle(name).build(); } @Override public ODataLink newEntityNavigationLink(final String name, final URI baseURI, final String href) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(baseURI, href). + return new ODataLink.Builder().setVersion(version).setURI(baseURI, href). setType(ODataLinkType.ENTITY_NAVIGATION).setTitle(name).build(); } @Override public ODataLink newFeedNavigationLink(final String name, final URI link) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(link). + return new ODataLink.Builder().setVersion(version).setURI(link). setType(ODataLinkType.ENTITY_SET_NAVIGATION).setTitle(name).build(); } @Override public ODataLink newFeedNavigationLink(final String name, final URI baseURI, final String href) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(baseURI, href). + return new ODataLink.Builder().setVersion(version).setURI(baseURI, href). setType(ODataLinkType.ENTITY_SET_NAVIGATION).setTitle(name).build(); } @Override public ODataLink newAssociationLink(final String name, final URI link) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(link). + return new ODataLink.Builder().setVersion(version).setURI(link). setType(ODataLinkType.ASSOCIATION).setTitle(name).build(); } @Override public ODataLink newAssociationLink(final String name, final URI baseURI, final String href) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(baseURI, href). + return new ODataLink.Builder().setVersion(version).setURI(baseURI, href). setType(ODataLinkType.ASSOCIATION).setTitle(name).build(); } @Override public ODataLink newMediaEditLink(final String name, final URI link) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(link). + return new ODataLink.Builder().setVersion(version).setURI(link). setType(ODataLinkType.MEDIA_EDIT).setTitle(name).build(); } @Override public ODataLink newMediaEditLink(final String name, final URI baseURI, final String href) { - return new ODataLink.Builder().setVersion(client.getServiceVersion()).setURI(baseURI, href). + return new ODataLink.Builder().setVersion(version).setURI(baseURI, href). setType(ODataLinkType.MEDIA_EDIT).setTitle(name).build(); } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java index 8b44e2b6b..525114ea5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.client.core.op; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.format.ODataPubFormat; -import org.apache.olingo.client.core.data.AtomEntryImpl; -import org.apache.olingo.client.core.data.AtomFeedImpl; -import org.apache.olingo.client.core.data.AtomPropertyImpl; -import org.apache.olingo.client.core.data.JSONEntryImpl; -import org.apache.olingo.client.core.data.JSONFeedImpl; -import org.apache.olingo.client.core.data.JSONPropertyImpl; +import org.apache.olingo.commons.core.data.AtomEntryImpl; +import org.apache.olingo.commons.core.data.AtomFeedImpl; +import org.apache.olingo.commons.core.data.AtomPropertyImpl; +import org.apache.olingo.commons.core.data.JSONEntryImpl; +import org.apache.olingo.commons.core.data.JSONFeedImpl; +import org.apache.olingo.commons.core.data.JSONPropertyImpl; public class ResourceFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java index ba9f7c247..3c5f5a45c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataBinderImpl.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.core.op.impl.v3; -import org.apache.olingo.client.api.data.v3.LinkCollection; +import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; import org.apache.olingo.client.api.op.v3.ODataBinder; import org.apache.olingo.client.core.op.AbstractODataBinder; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java index 0baf40345..9abd8e325 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java @@ -21,24 +21,24 @@ package org.apache.olingo.client.core.op.impl.v3; import java.io.InputStream; import org.apache.olingo.client.api.data.ServiceDocument; -import org.apache.olingo.client.api.data.v3.LinkCollection; +import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v3.ODataDeserializer; -import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.core.data.v3.JSONLinkCollectionImpl; -import org.apache.olingo.client.core.data.v3.XMLLinkCollectionImpl; +import org.apache.olingo.commons.core.data.v3.JSONLinkCollectionImpl; +import org.apache.olingo.commons.core.data.v3.XMLLinkCollectionImpl; import org.apache.olingo.client.core.data.v3.JSONServiceDocumentImpl; import org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl; import org.apache.olingo.client.core.edm.xml.v3.EdmxImpl; import org.apache.olingo.client.core.edm.xml.v3.XMLMetadataImpl; import org.apache.olingo.client.core.op.AbstractODataDeserializer; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { private static final long serialVersionUID = -8221085862548914611L; - public ODataDeserializerImpl(final ODataClient client) { - super(client); + public ODataDeserializerImpl(final ODataServiceVersion version) { + super(version); } @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java index 14f5a40d9..d1fa5f045 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.client.core.op.impl.v3; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.core.op.AbstractODataSerializer; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataSerializerImpl extends AbstractODataSerializer { private static final long serialVersionUID = -8861908250297989806L; - public ODataSerializerImpl(final CommonODataClient client) { - super(client); + public ODataSerializerImpl(final ODataServiceVersion version) { + super(version); } } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java index 3b825e251..414790145 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java @@ -24,19 +24,19 @@ import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.client.api.op.v4.ODataDeserializer; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl; import org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl; import org.apache.olingo.client.core.edm.xml.v4.EdmxImpl; import org.apache.olingo.client.core.edm.xml.v4.XMLMetadataImpl; import org.apache.olingo.client.core.op.AbstractODataDeserializer; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { private static final long serialVersionUID = 8593081342440470415L; - public ODataDeserializerImpl(final ODataClient client) { - super(client); + public ODataDeserializerImpl(final ODataServiceVersion version) { + super(version); } @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java index d79b8f84d..309ed9107 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.client.core.op.impl.v4; -import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.core.op.AbstractODataSerializer; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataSerializerImpl extends AbstractODataSerializer { private static final long serialVersionUID = 7587265188399685309L; - public ODataSerializerImpl(final CommonODataClient client) { - super(client); + public ODataSerializerImpl(final ODataServiceVersion version) { + super(version); } } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java index 095f8ae5d..36bb1c24b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java @@ -32,7 +32,7 @@ import org.apache.commons.codec.binary.Hex; import org.apache.commons.io.IOUtils; import org.apache.http.entity.InputStreamEntity; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTime; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java index b7f0c3b79..34d706923 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java @@ -56,9 +56,9 @@ public class ODataClientImpl extends AbstractODataClient implements ODataClient private final FilterFactory filterFactory = new FilterFactoryImpl(); - private final ODataDeserializer deserializer = new ODataDeserializerImpl(this); + private final ODataDeserializer deserializer = new ODataDeserializerImpl(getServiceVersion()); - private final ODataSerializer serializer = new ODataSerializerImpl(this); + private final ODataSerializer serializer = new ODataSerializerImpl(getServiceVersion()); private final ODataReader reader = new ODataReaderImpl(this); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java index 74c439a3e..ebab41acb 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java @@ -56,9 +56,9 @@ public class ODataClientImpl extends AbstractODataClient implements ODataClient private final FilterFactory filterFactory = new FilterFactoryImpl(); - private final ODataDeserializer deserializer = new ODataDeserializerImpl(this); + private final ODataDeserializer deserializer = new ODataDeserializerImpl(getServiceVersion()); - private final ODataSerializer serializer = new ODataSerializerImpl(this); + private final ODataSerializer serializer = new ODataSerializerImpl(getServiceVersion()); private final ODataReader reader = new ODataReaderImpl(this); diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java index fe3f0981f..21d8c5d49 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AbstractPrimitiveTest.java @@ -28,7 +28,7 @@ import java.util.Iterator; import java.util.List; import java.util.UUID; import org.apache.commons.codec.binary.Base64; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.domain.ODataGeospatialValue; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.ODataProperty; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/AtomLinksQualifier.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/AtomLinksQualifier.java index 94aab69df..2e6eedfbe 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/AtomLinksQualifier.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/AtomLinksQualifier.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.core; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.custommonkey.xmlunit.ElementNameQualifier; import org.w3c.dom.Element; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java index 5e7ea2f1a..9b4bd393b 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/AbstractTestITCase.java @@ -50,8 +50,8 @@ import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.ODataEntity; @@ -65,8 +65,8 @@ import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.client.core.data.AtomEntryImpl; -import org.apache.olingo.client.core.data.JSONEntryImpl; +import org.apache.olingo.commons.core.data.AtomEntryImpl; +import org.apache.olingo.commons.core.data.JSONEntryImpl; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.BeforeClass; import org.slf4j.Logger; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java index d34da8884..548edd259 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/QueryOptionsTestITCase.java @@ -28,14 +28,14 @@ import java.util.List; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; -import org.apache.olingo.client.api.data.Entry; +import org.apache.olingo.commons.api.data.Entry; import org.apache.olingo.commons.api.domain.ODataEntity; import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.commons.api.domain.ODataInlineEntitySet; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.v3.URIBuilder.InlineCount; -import org.apache.olingo.client.core.data.AtomEntryImpl; +import org.apache.olingo.commons.core.data.AtomEntryImpl; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java index d57c561bb..c3b155248 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/JSONTest.java @@ -29,7 +29,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import org.apache.commons.io.IOUtils; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.format.ODataPubFormat; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java index b4c3d6b77..b4c048fff 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/Constants.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/Constants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api; +package org.apache.olingo.commons.api; import javax.xml.XMLConstants; import javax.xml.namespace.QName; @@ -29,6 +29,8 @@ public interface Constants { // Other stuff public final static String UTF8 = "UTF-8"; + public final static String METADATA = "$metadata"; + public final static Integer DEFAULT_PRECISION = 40; public final static Integer DEFAULT_SCALE = 25; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/CollectionValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/CollectionValue.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/CollectionValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/CollectionValue.java index 072890d28..0d55671ba 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/CollectionValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/CollectionValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; import java.util.List; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ComplexValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/ComplexValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java index 80e9c8fc8..67a2f0428 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/ComplexValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ComplexValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; import java.util.List; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entry.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entry.java index 0fcf77c99..ea73b7dfc 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Entry.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Entry.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; import org.apache.olingo.commons.api.domain.ODataOperation; import java.net.URI; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Feed.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Feed.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/Feed.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Feed.java index 6c4e2f933..4e98ac603 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Feed.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Feed.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; import java.net.URI; import java.util.List; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/GeoUtils.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/GeoUtils.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java index 083b4e059..fa7538db9 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/GeoUtils.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeoUtils.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/GeospatialValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeospatialValue.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/GeospatialValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeospatialValue.java index c5d4d2aeb..08dcf4bb2 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/GeospatialValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/GeospatialValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; import org.apache.olingo.commons.api.edm.geo.Geospatial; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Link.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java similarity index 97% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/Link.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java index b707c8b7e..f0a35a57f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Link.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Link.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; public interface Link { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/NullValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/NullValue.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/NullValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/NullValue.java index 5df0509f9..2fed97545 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/NullValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/NullValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; public interface NullValue extends Value { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/PrimitiveValue.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/PrimitiveValue.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/PrimitiveValue.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/PrimitiveValue.java index 6d0636bc6..dabbc4766 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/PrimitiveValue.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/PrimitiveValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; public interface PrimitiveValue extends Value { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Property.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java similarity index 95% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/Property.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java index d4112d9f4..feb8f71a7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Property.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Property.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; public interface Property { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Value.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Value.java similarity index 96% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/Value.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Value.java index 275fd9d5a..045751da4 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/Value.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/Value.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data; +package org.apache.olingo.commons.api.data; public interface Value { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/v3/LinkCollection.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/v3/LinkCollection.java similarity index 96% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/data/v3/LinkCollection.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/v3/LinkCollection.java index dfcaa35d4..72186fc59 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/data/v3/LinkCollection.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/v3/LinkCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.data.v3; +package org.apache.olingo.commons.api.data.v3; import java.net.URI; import java.util.List; diff --git a/lib/commons-core/pom.xml b/lib/commons-core/pom.xml index a767566b8..f025fd049 100644 --- a/lib/commons-core/pom.xml +++ b/lib/commons-core/pom.xml @@ -45,6 +45,27 @@ <artifactId>commons-codec</artifactId> </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.dataformat</groupId> + <artifactId>jackson-dataformat-xml</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml</groupId> + <artifactId>aalto-xml</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractAtomDealer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAtomDealer.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractAtomDealer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAtomDealer.java index eb62b44d4..940d8a539 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractAtomDealer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAtomDealer.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import javax.xml.XMLConstants; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; abstract class AbstractAtomDealer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractAtomObject.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAtomObject.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractAtomObject.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAtomObject.java index 76004d175..f09de400e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractAtomObject.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAtomObject.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.databind.util.ISO8601DateFormat; import java.net.URI; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractEntry.java similarity index 94% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractEntry.java index 8b513bffd..29a4a75f7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractEntry.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractEntry.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.util.ArrayList; import java.util.List; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Link; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.domain.ODataOperation; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java similarity index 93% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java index 4b0ee0ed0..2d865ce33 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonDeserializer.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; import java.util.Iterator; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.CollectionValue; -import org.apache.olingo.client.api.data.ComplexValue; -import org.apache.olingo.client.api.data.Value; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.CollectionValue; +import org.apache.olingo.commons.api.data.ComplexValue; +import org.apache.olingo.commons.api.data.Value; import org.apache.olingo.commons.api.domain.ODataPropertyType; -import org.apache.olingo.client.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; abstract class AbstractJsonDeserializer<T> extends ODataJacksonDeserializer<T> { @@ -37,7 +37,7 @@ abstract class AbstractJsonDeserializer<T> extends ODataJacksonDeserializer<T> { private JSONGeoValueDeserializer getGeoDeserializer() { if (geoDeserializer == null) { - geoDeserializer = new JSONGeoValueDeserializer(client.getServiceVersion()); + geoDeserializer = new JSONGeoValueDeserializer(version); } return geoDeserializer; } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java similarity index 93% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonSerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java index 742784538..1380dd54d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractJsonSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractJsonSerializer.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.math.NumberUtils; -import org.apache.olingo.client.api.data.CollectionValue; -import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.data.Value; -import org.apache.olingo.client.core.edm.EdmTypeInfo; +import org.apache.olingo.commons.api.data.CollectionValue; +import org.apache.olingo.commons.api.data.Property; +import org.apache.olingo.commons.api.data.Value; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; abstract class AbstractJsonSerializer<T> extends ODataJacksonSerializer<T> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractPayloadObject.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractPayloadObject.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractPayloadObject.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractPayloadObject.java index b707c4971..bad009d2d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractPayloadObject.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractPayloadObject.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.io.Serializable; import org.apache.commons.lang3.builder.EqualsBuilder; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractPropertyImpl.java similarity index 93% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractPropertyImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractPropertyImpl.java index 3e92ac4c7..e005f98fe 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractPropertyImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.data.Value; +import org.apache.olingo.commons.api.data.Property; +import org.apache.olingo.commons.api.data.Value; public abstract class AbstractPropertyImpl implements Property { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractValue.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractValue.java similarity index 85% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractValue.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractValue.java index 9f2d19a3b..31629e2e9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractValue.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractValue.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.apache.olingo.client.api.data.CollectionValue; -import org.apache.olingo.client.api.data.ComplexValue; -import org.apache.olingo.client.api.data.GeospatialValue; -import org.apache.olingo.client.api.data.NullValue; -import org.apache.olingo.client.api.data.PrimitiveValue; -import org.apache.olingo.client.api.data.Value; +import org.apache.olingo.commons.api.data.CollectionValue; +import org.apache.olingo.commons.api.data.ComplexValue; +import org.apache.olingo.commons.api.data.GeospatialValue; +import org.apache.olingo.commons.api.data.NullValue; +import org.apache.olingo.commons.api.data.PrimitiveValue; +import org.apache.olingo.commons.api.data.Value; public abstract class AbstractValue implements Value { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java index 74d98a6cc..f42fe00a0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomDeserializer.java @@ -16,9 +16,8 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; -import org.apache.olingo.client.core.data.v3.XMLLinkCollectionImpl; import java.io.InputStream; import java.net.URI; import java.text.ParseException; @@ -29,10 +28,11 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.Attribute; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; -import org.apache.http.entity.ContentType; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.commons.core.data.v3.XMLLinkCollectionImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -258,7 +258,7 @@ public class AtomDeserializer extends AbstractAtomDealer { entry.getOperations().add(operation); } else if (Constants.QNAME_ATOM_ELEM_CONTENT.equals(event.asStartElement().getName())) { final Attribute type = event.asStartElement().getAttributeByName(QName.valueOf(Constants.ATTR_TYPE)); - if (type == null || ContentType.APPLICATION_XML.getMimeType().equals(type.getValue())) { + if (type == null || ContentType.APPLICATION_XML.equals(type.getValue())) { properties(reader, skipBeforeFirstStartElement(reader), entry); } else { entry.setMediaContentType(type.getValue()); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomEntryImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomEntryImpl.java similarity index 95% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomEntryImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomEntryImpl.java index aa7c0c119..8eef97aef 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomEntryImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomEntryImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; public class AtomEntryImpl extends AbstractEntry { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomFeedImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomFeedImpl.java similarity index 91% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomFeedImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomFeedImpl.java index 94f254079..d40f94529 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomFeedImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomFeedImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; /** * List of entries, represented via Atom. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomGeoValueDeserializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomGeoValueDeserializer.java index 1187a8175..458e4cc76 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomGeoValueDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.util.ArrayList; import java.util.Collections; @@ -27,8 +27,8 @@ import javax.xml.stream.events.Attribute; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.GeoUtils; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.GeoUtils; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomGeoValueSerializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomGeoValueSerializer.java index 02425b466..624bcfae4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomGeoValueSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomGeoValueSerializer.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.util.Collections; import java.util.Iterator; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.GeospatialCollection; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertyDeserializer.java similarity index 95% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertyDeserializer.java index 736d791c0..99231b45d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertyDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLStreamException; @@ -24,14 +24,14 @@ import javax.xml.stream.events.Attribute; import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.CollectionValue; -import org.apache.olingo.client.api.data.ComplexValue; -import org.apache.olingo.client.api.data.Value; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.CollectionValue; +import org.apache.olingo.commons.api.data.ComplexValue; +import org.apache.olingo.commons.api.data.Value; import org.apache.olingo.commons.api.domain.ODataPropertyType; -import org.apache.olingo.client.core.edm.EdmTypeInfo; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; class AtomPropertyDeserializer extends AbstractAtomDealer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertyImpl.java similarity index 95% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertyImpl.java index c2a94fb9a..9688db2d1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertyImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; public class AtomPropertyImpl extends AbstractPropertyImpl { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertySerializer.java similarity index 92% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertySerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertySerializer.java index b1ef2e67c..8d2a8e1ea 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomPropertySerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomPropertySerializer.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.CollectionValue; -import org.apache.olingo.client.api.data.Property; -import org.apache.olingo.client.api.data.Value; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.CollectionValue; +import org.apache.olingo.commons.api.data.Property; +import org.apache.olingo.commons.api.data.Value; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; class AtomPropertySerializer extends AbstractAtomDealer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java similarity index 96% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomSerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java index 8337a722a..4c6fb3a52 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AtomSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AtomSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.io.Writer; import java.util.Collections; @@ -26,13 +26,13 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.apache.commons.lang3.StringUtils; -import org.apache.http.entity.ContentType; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Link; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.api.format.ContentType; public class AtomSerializer extends AbstractAtomDealer { @@ -163,7 +163,7 @@ public class AtomSerializer extends AbstractAtomDealer { writer.writeStartElement(version.getNamespaceMap().get(ODataServiceVersion.NS_METADATA), Constants.PROPERTIES); properties(writer, entry.getProperties()); } else { - writer.writeAttribute(Constants.ATTR_TYPE, ContentType.APPLICATION_XML.getMimeType()); + writer.writeAttribute(Constants.ATTR_TYPE, ContentType.APPLICATION_XML); writer.writeStartElement(version.getNamespaceMap().get(ODataServiceVersion.NS_METADATA), Constants.PROPERTIES); properties(writer, entry.getProperties()); writer.writeEndElement(); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/CollectionValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/CollectionValueImpl.java similarity index 88% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/CollectionValueImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/CollectionValueImpl.java index fa2e23c04..02c6d43da 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/CollectionValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/CollectionValueImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.data.CollectionValue; -import org.apache.olingo.client.api.data.Value; +import org.apache.olingo.commons.api.data.CollectionValue; +import org.apache.olingo.commons.api.data.Value; public class CollectionValueImpl extends AbstractValue implements CollectionValue { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ComplexValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ComplexValueImpl.java similarity index 88% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/ComplexValueImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ComplexValueImpl.java index 9f4f5aba0..0144f833f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ComplexValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ComplexValueImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.data.ComplexValue; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.data.ComplexValue; +import org.apache.olingo.commons.api.data.Property; public class ComplexValueImpl extends AbstractValue implements ComplexValue { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/GeospatialValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/GeospatialValueImpl.java similarity index 92% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/GeospatialValueImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/GeospatialValueImpl.java index fdb0f445d..e278334c1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/GeospatialValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/GeospatialValueImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; -import org.apache.olingo.client.api.data.GeospatialValue; +import org.apache.olingo.commons.api.data.GeospatialValue; import org.apache.olingo.commons.api.edm.geo.Geospatial; public class GeospatialValueImpl extends AbstractValue implements GeospatialValue { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntryDeserializer.java similarity index 94% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntryDeserializer.java index 2626a95b3..3647fac5e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntryDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; @@ -34,8 +34,8 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.Link; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Link; import org.apache.olingo.commons.api.domain.ODataLinkType; import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; @@ -156,8 +156,7 @@ public class JSONEntryDeserializer extends AbstractJsonDeserializer<JSONEntryImp if (field.getKey().endsWith(Constants.JSON_NAVIGATION_LINK_SUFFIX)) { final LinkImpl link = new LinkImpl(); link.setTitle(getTitle(field)); - link.setRel(client.getServiceVersion().getNamespaceMap(). - get(ODataServiceVersion.NAVIGATION_LINK_REL) + getTitle(field)); + link.setRel(version.getNamespaceMap().get(ODataServiceVersion.NAVIGATION_LINK_REL) + getTitle(field)); if (field.getValue().isValueNode()) { link.setHref(field.getValue().textValue()); @@ -176,8 +175,7 @@ public class JSONEntryDeserializer extends AbstractJsonDeserializer<JSONEntryImp } else if (field.getKey().endsWith(Constants.JSON_ASSOCIATION_LINK_SUFFIX)) { final LinkImpl link = new LinkImpl(); link.setTitle(getTitle(field)); - link.setRel(client.getServiceVersion().getNamespaceMap(). - get(ODataServiceVersion.ASSOCIATION_LINK_REL) + getTitle(field)); + link.setRel(version.getNamespaceMap().get(ODataServiceVersion.ASSOCIATION_LINK_REL) + getTitle(field)); link.setHref(field.getValue().textValue()); link.setType(ODataLinkType.ASSOCIATION.toString()); entry.getAssociationLinks().add(link); @@ -186,8 +184,7 @@ public class JSONEntryDeserializer extends AbstractJsonDeserializer<JSONEntryImp } else if (field.getKey().endsWith(Constants.JSON_MEDIAEDIT_LINK_SUFFIX)) { final LinkImpl link = new LinkImpl(); link.setTitle(getTitle(field)); - link.setRel(client.getServiceVersion().getNamespaceMap(). - get(ODataServiceVersion.MEDIA_EDIT_LINK_REL) + getTitle(field)); + link.setRel(version.getNamespaceMap().get(ODataServiceVersion.MEDIA_EDIT_LINK_REL) + getTitle(field)); link.setHref(field.getValue().textValue()); link.setType(ODataLinkType.MEDIA_EDIT.toString()); entry.getMediaEditLinks().add(link); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntryImpl.java similarity index 94% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntryImpl.java index cafe2897d..765c18a20 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntryImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntryImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.net.URI; import java.text.ParseException; -import org.apache.olingo.client.api.uri.SegmentType; +import org.apache.olingo.commons.api.Constants; /** * A single entry, represented via JSON. @@ -46,7 +46,7 @@ public class JSONEntryImpl extends AbstractEntry { URI baseURI = null; if (metadata != null) { final String metadataURI = getMetadata().toASCIIString(); - baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue()))); + baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(Constants.METADATA))); } return baseURI; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntrySerializer.java similarity index 92% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntrySerializer.java index 348015e54..404174811 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONEntrySerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONEntrySerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; @@ -27,10 +27,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Link; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Link; +import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.domain.ODataLinkType; /** @@ -56,7 +56,7 @@ public class JSONEntrySerializer extends AbstractJsonSerializer<JSONEntryImpl> { for (Link link : entry.getNavigationLinks()) { ODataLinkType type = null; try { - type = ODataLinkType.fromString(client.getServiceVersion(), link.getRel(), link.getType()); + type = ODataLinkType.fromString(version, link.getRel(), link.getType()); } catch (IllegalArgumentException e) { // ignore } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorBundle.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONErrorBundle.java similarity index 96% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorBundle.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONErrorBundle.java index a73fb0506..433b7540a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorBundle.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONErrorBundle.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONErrorImpl.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONErrorImpl.java index 53056958e..4c6cb4a44 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONErrorImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONErrorImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedDeserializer.java similarity index 96% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedDeserializer.java index 3667feace..81a8d473b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -26,7 +26,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; import java.net.URI; import java.util.Iterator; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; /** * Reads JSON string into a feed. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedImpl.java similarity index 91% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedImpl.java index 271ef3d45..f41e21c24 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.uri.SegmentType; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.Constants; /** * List of entries, represented via JSON. @@ -53,7 +53,7 @@ public class JSONFeedImpl extends AbstractPayloadObject implements Feed { URI baseURI = null; if (metadata != null) { final String metadataURI = getMetadata().toASCIIString(); - baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue()))); + baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(Constants.METADATA))); } return baseURI; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedSerializer.java similarity index 93% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedSerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedSerializer.java index f89303ecf..25a735858 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONFeedSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONFeedSerializer.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.Entry; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Entry; public class JSONFeedSerializer extends AbstractJsonSerializer<JSONFeedImpl> { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONGeoValueDeserializer.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONGeoValueDeserializer.java index c58ff66e5..f1863a7f8 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONGeoValueDeserializer.java @@ -16,16 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.databind.JsonNode; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.GeoUtils; -import org.apache.olingo.client.core.edm.EdmTypeInfo; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.GeoUtils; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; @@ -37,6 +36,7 @@ import org.apache.olingo.commons.api.edm.geo.MultiPoint; import org.apache.olingo.commons.api.edm.geo.MultiPolygon; import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; class JSONGeoValueDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONGeoValueSerializer.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONGeoValueSerializer.java index 4794b01e5..95c30d49d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONGeoValueSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONGeoValueSerializer.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonGenerator; import java.io.IOException; import java.util.Iterator; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.ComposedGeospatial; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertyDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertyDeserializer.java similarity index 96% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertyDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertyDeserializer.java index 172498a97..b68d99856 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertyDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertyDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.node.ObjectNode; import java.io.IOException; import java.net.URI; -import org.apache.olingo.client.api.Constants; +import org.apache.olingo.commons.api.Constants; /** * Parse JSON string into <tt>JSONPropertyImpl</tt>. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertyImpl.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertyImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertyImpl.java index 1002d3b73..027eac33e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertyImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertySerializer.java similarity index 93% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertySerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertySerializer.java index 21e017b77..104083bc3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONPropertySerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/JSONPropertySerializer.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; -import org.apache.olingo.client.api.Constants; -import org.apache.olingo.client.api.data.Property; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.data.Property; /** * Writes out JSON string from <tt>JSONPropertyImpl</tt>. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/LinkImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/LinkImpl.java similarity index 92% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/LinkImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/LinkImpl.java index 2bba50472..85fabdc31 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/LinkImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/LinkImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; -import org.apache.olingo.client.api.data.Entry; -import org.apache.olingo.client.api.data.Feed; -import org.apache.olingo.client.api.data.Link; +import org.apache.olingo.commons.api.data.Entry; +import org.apache.olingo.commons.api.data.Feed; +import org.apache.olingo.commons.api.data.Link; public class LinkImpl extends AbstractPayloadObject implements Link { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/NullValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/NullValueImpl.java similarity index 91% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/NullValueImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/NullValueImpl.java index 83e6785bf..1fca3295a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/NullValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/NullValueImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; -import org.apache.olingo.client.api.data.NullValue; +import org.apache.olingo.commons.api.data.NullValue; public class NullValueImpl extends AbstractValue implements NullValue { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ODataJacksonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ODataJacksonDeserializer.java similarity index 79% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/ODataJacksonDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ODataJacksonDeserializer.java index 49c85fb6b..e882be239 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ODataJacksonDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ODataJacksonDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; @@ -24,12 +24,11 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import java.io.IOException; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.client.api.CommonODataClient; +public abstract class ODataJacksonDeserializer<T> extends JsonDeserializer<T> { -abstract class ODataJacksonDeserializer<T> extends JsonDeserializer<T> { - - protected CommonODataClient client; + protected ODataServiceVersion version; protected abstract T doDeserialize(JsonParser jp, DeserializationContext ctxt) throws IOException, JsonProcessingException; @@ -38,7 +37,7 @@ abstract class ODataJacksonDeserializer<T> extends JsonDeserializer<T> { public T deserialize(final JsonParser jp, final DeserializationContext ctxt) throws IOException, JsonProcessingException { - client = (CommonODataClient) ctxt.findInjectableValue(CommonODataClient.class.getName(), null, null); + version = (ODataServiceVersion) ctxt.findInjectableValue(ODataServiceVersion.class.getName(), null, null); return doDeserialize(jp, ctxt); } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ODataJacksonSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ODataJacksonSerializer.java similarity index 81% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/ODataJacksonSerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ODataJacksonSerializer.java index 4638c18bf..31ed332ec 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ODataJacksonSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/ODataJacksonSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; @@ -25,11 +25,11 @@ import com.fasterxml.jackson.databind.SerializerProvider; import java.io.IOException; -import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -abstract class ODataJacksonSerializer<T> extends JsonSerializer<T> { +public abstract class ODataJacksonSerializer<T> extends JsonSerializer<T> { - protected CommonODataClient client; + protected ODataServiceVersion version; protected abstract void doSerialize(T value, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException; @@ -38,7 +38,7 @@ abstract class ODataJacksonSerializer<T> extends JsonSerializer<T> { public void serialize(final T value, final JsonGenerator jgen, final SerializerProvider provider) throws IOException, JsonProcessingException { - client = (CommonODataClient) provider.getAttribute(CommonODataClient.class); + version = (ODataServiceVersion) provider.getAttribute(ODataServiceVersion.class); doSerialize(value, jgen, provider); } diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/PrimitiveValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/PrimitiveValueImpl.java similarity index 91% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/PrimitiveValueImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/PrimitiveValueImpl.java index 6d61cf4aa..2d0a6bc0c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/PrimitiveValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/PrimitiveValueImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; -import org.apache.olingo.client.api.data.PrimitiveValue; +import org.apache.olingo.commons.api.data.PrimitiveValue; public class PrimitiveValueImpl extends AbstractValue implements PrimitiveValue { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/XMLErrorImpl.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/XMLErrorImpl.java index 9e5b3c820..a8c3d84d3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLErrorImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/XMLErrorImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data; +package org.apache.olingo.commons.core.data; import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/JSONLinkCollectionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/JSONLinkCollectionImpl.java similarity index 94% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/JSONLinkCollectionImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/JSONLinkCollectionImpl.java index 00b836188..b0bd6e095 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/JSONLinkCollectionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/JSONLinkCollectionImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data.v3; +package org.apache.olingo.commons.core.data.v3; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.data.v3.LinkCollection; -import org.apache.olingo.client.core.data.AbstractPayloadObject; +import org.apache.olingo.commons.api.data.v3.LinkCollection; +import org.apache.olingo.commons.core.data.AbstractPayloadObject; /** * Link from an entry, represented via JSON. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/XMLLinkCollectionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/XMLLinkCollectionImpl.java similarity index 93% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/XMLLinkCollectionImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/XMLLinkCollectionImpl.java index d5dc4423a..8d9001c27 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v3/XMLLinkCollectionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/XMLLinkCollectionImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.data.v3; +package org.apache.olingo.commons.core.data.v3; import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.data.v3.LinkCollection; +import org.apache.olingo.commons.api.data.v3.LinkCollection; public class XMLLinkCollectionImpl implements LinkCollection { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeInfo.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeInfo.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java index 461e829a8..567950d12 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeInfo.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmTypeInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.edm; +package org.apache.olingo.commons.core.edm; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.edm.Edm; From a55ed62accf3686daf6359ec2923455b535c9199 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Francesco=20Chicchiricc=C3=B2?= <ilgrosso@apache.org> Date: Mon, 24 Mar 2014 09:45:25 +0100 Subject: [PATCH 7/7] [OLINGO-200] Moving ODataDeserializer and ODataSerializer (interfaces and impl) to commons --- .../olingo/client/api/CommonODataClient.java | 6 +-- .../api/op/ClientODataDeserializer.java | 39 +++++++++++++++++++ .../client/api/op/v3/ODataDeserializer.java | 4 +- .../client/api/op/v4/ODataDeserializer.java | 4 +- .../client/core/AbstractODataClient.java | 2 +- .../client/core/op/AbstractODataBinder.java | 1 + .../client/core/op/ODataWriterImpl.java | 1 + .../op/impl/v3/ODataDeserializerImpl.java | 2 +- .../core/op/impl/v3/ODataSerializerImpl.java | 2 +- .../op/impl/v4/ODataDeserializerImpl.java | 2 +- .../core/op/impl/v4/ODataSerializerImpl.java | 2 +- .../client/core/v3/ODataClientImpl.java | 2 +- .../client/core/v4/ODataClientImpl.java | 2 +- .../core/it/v3/EntityRetrieveTestITCase.java | 2 +- .../core/it/v3/EntitySetTestITCase.java | 2 +- .../olingo/client/core/v3/EntitySetTest.java | 2 +- .../olingo/client/core/v3/EntityTest.java | 2 +- .../api/op/CommonODataDeserializer.java | 17 +------- .../commons}/api/op/ODataSerializer.java | 2 +- .../commons}/core/op/AbstractJacksonTool.java | 2 +- .../core/op/AbstractODataDeserializer.java | 4 +- .../core/op/AbstractODataSerializer.java | 4 +- .../core/op/InjectableSerializerProvider.java | 2 +- .../core/op/ODataObjectFactoryImpl.java | 2 +- .../commons}/core/op/ResourceFactory.java | 2 +- 25 files changed, 70 insertions(+), 42 deletions(-) create mode 100644 lib/client-api/src/main/java/org/apache/olingo/client/api/op/ClientODataDeserializer.java rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/op/CommonODataDeserializer.java (80%) rename lib/{client-api/src/main/java/org/apache/olingo/client => commons-api/src/main/java/org/apache/olingo/commons}/api/op/ODataSerializer.java (98%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/op/AbstractJacksonTool.java (98%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/op/AbstractODataDeserializer.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/op/AbstractODataSerializer.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/op/InjectableSerializerProvider.java (97%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/op/ODataObjectFactoryImpl.java (99%) rename lib/{client-core/src/main/java/org/apache/olingo/client => commons-core/src/main/java/org/apache/olingo/commons}/core/op/ResourceFactory.java (98%) diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java index 4b708d9eb..e863d0de1 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/CommonODataClient.java @@ -24,13 +24,13 @@ import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFa import org.apache.olingo.client.api.communication.request.invoke.CommonInvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.streamed.CommonStreamedRequestFactory; +import org.apache.olingo.client.api.op.ClientODataDeserializer; import org.apache.olingo.commons.api.domain.ODataObjectFactory; import org.apache.olingo.commons.api.domain.ODataGeospatialValue; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.client.api.op.CommonODataBinder; -import org.apache.olingo.client.api.op.CommonODataDeserializer; import org.apache.olingo.client.api.op.CommonODataReader; -import org.apache.olingo.client.api.op.ODataSerializer; +import org.apache.olingo.commons.api.op.ODataSerializer; import org.apache.olingo.client.api.op.ODataWriter; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.CommonFilterFactory; @@ -54,7 +54,7 @@ public interface CommonODataClient { ODataSerializer getSerializer(); - CommonODataDeserializer getDeserializer(); + ClientODataDeserializer getDeserializer(); CommonODataReader getReader(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ClientODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ClientODataDeserializer.java new file mode 100644 index 000000000..ad482fb33 --- /dev/null +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ClientODataDeserializer.java @@ -0,0 +1,39 @@ +/* + * 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 + * + * 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. + */ +package org.apache.olingo.client.api.op; + +import java.io.InputStream; +import org.apache.olingo.client.api.data.ServiceDocument; +import org.apache.olingo.client.api.edm.xml.XMLMetadata; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.apache.olingo.commons.api.op.CommonODataDeserializer; + +public interface ClientODataDeserializer extends CommonODataDeserializer { + + XMLMetadata toMetadata(InputStream input); + + /** + * Gets the ServiceDocument object represented by the given InputStream. + * + * @param input stream to be de-serialized. + * @param format OData service document format. + * @return <tt>ServiceDocument</tt> object. + */ + ServiceDocument toServiceDocument(InputStream input, ODataFormat format); +} diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java index 6c7a2bbdb..b12b104d4 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v3/ODataDeserializer.java @@ -19,11 +19,11 @@ package org.apache.olingo.client.api.op.v3; import java.io.InputStream; +import org.apache.olingo.client.api.op.ClientODataDeserializer; import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.client.api.op.CommonODataDeserializer; -public interface ODataDeserializer extends CommonODataDeserializer { +public interface ODataDeserializer extends ClientODataDeserializer { /** * Gets a list of links from the given InputStream. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v4/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v4/ODataDeserializer.java index 425e530cb..8b0e0b7f5 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v4/ODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/op/v4/ODataDeserializer.java @@ -21,9 +21,9 @@ package org.apache.olingo.client.api.op.v4; import java.io.InputStream; import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata; -import org.apache.olingo.client.api.op.CommonODataDeserializer; +import org.apache.olingo.client.api.op.ClientODataDeserializer; -public interface ODataDeserializer extends CommonODataDeserializer { +public interface ODataDeserializer extends ClientODataDeserializer { @Override XMLMetadata toMetadata(InputStream input); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java index b5603fc5b..419709484 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/AbstractODataClient.java @@ -23,7 +23,7 @@ import org.apache.olingo.commons.api.domain.ODataObjectFactory; import org.apache.olingo.client.api.op.ODataWriter; import org.apache.olingo.client.core.domain.ODataGeospatialValueImpl; import org.apache.olingo.client.core.domain.ODataPrimitiveValueImpl; -import org.apache.olingo.client.core.op.ODataObjectFactoryImpl; +import org.apache.olingo.commons.core.op.ODataObjectFactoryImpl; import org.apache.olingo.client.core.op.ODataWriterImpl; public abstract class AbstractODataClient implements CommonODataClient { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java index d2e9eded3..0524c1360 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataBinder.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.op; +import org.apache.olingo.commons.core.op.ResourceFactory; import java.io.StringWriter; import java.net.URI; import java.util.Iterator; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java index 80f4f11e2..2b914b4ae 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataWriterImpl.java @@ -18,6 +18,7 @@ */ package org.apache.olingo.client.core.op; +import org.apache.olingo.commons.core.op.ResourceFactory; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.InputStream; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java index 9abd8e325..d6b05d9a9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataDeserializerImpl.java @@ -30,7 +30,7 @@ import org.apache.olingo.client.core.data.v3.JSONServiceDocumentImpl; import org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl; import org.apache.olingo.client.core.edm.xml.v3.EdmxImpl; import org.apache.olingo.client.core.edm.xml.v3.XMLMetadataImpl; -import org.apache.olingo.client.core.op.AbstractODataDeserializer; +import org.apache.olingo.commons.core.op.AbstractODataDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java index d1fa5f045..40b5b06dd 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v3/ODataSerializerImpl.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.core.op.impl.v3; -import org.apache.olingo.client.core.op.AbstractODataSerializer; +import org.apache.olingo.commons.core.op.AbstractODataSerializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataSerializerImpl extends AbstractODataSerializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java index 414790145..f9368537a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataDeserializerImpl.java @@ -28,7 +28,7 @@ import org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl; import org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl; import org.apache.olingo.client.core.edm.xml.v4.EdmxImpl; import org.apache.olingo.client.core.edm.xml.v4.XMLMetadataImpl; -import org.apache.olingo.client.core.op.AbstractODataDeserializer; +import org.apache.olingo.commons.core.op.AbstractODataDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java index 309ed9107..f75fb3e4c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/v4/ODataSerializerImpl.java @@ -18,7 +18,7 @@ */ package org.apache.olingo.client.core.op.impl.v4; -import org.apache.olingo.client.core.op.AbstractODataSerializer; +import org.apache.olingo.commons.core.op.AbstractODataSerializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; public class ODataSerializerImpl extends AbstractODataSerializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java index 34d706923..d10c87410 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v3/ODataClientImpl.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.communication.request.cud.v3.CUDRequestFacto import org.apache.olingo.client.api.communication.request.invoke.v3.InvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.v3.RetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.streamed.v3.StreamedRequestFactory; -import org.apache.olingo.client.api.op.ODataSerializer; +import org.apache.olingo.commons.api.op.ODataSerializer; import org.apache.olingo.client.api.op.v3.ODataDeserializer; import org.apache.olingo.client.api.op.v3.ODataBinder; import org.apache.olingo.client.api.op.v3.ODataReader; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java index ebab41acb..bb12f1add 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/v4/ODataClientImpl.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFacto import org.apache.olingo.client.api.communication.request.invoke.v4.InvokeRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.v4.RetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.streamed.v4.StreamedRequestFactory; -import org.apache.olingo.client.api.op.ODataSerializer; +import org.apache.olingo.commons.api.op.ODataSerializer; import org.apache.olingo.client.api.op.v4.ODataBinder; import org.apache.olingo.client.api.op.v4.ODataDeserializer; import org.apache.olingo.client.api.op.v4.ODataReader; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java index 609bd9a2d..eb8d31461 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityRetrieveTestITCase.java @@ -38,7 +38,7 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; -import org.apache.olingo.client.core.op.ResourceFactory; +import org.apache.olingo.commons.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java index aaa9ed7f8..b9ac09821 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntitySetTestITCase.java @@ -33,7 +33,7 @@ import org.apache.olingo.client.api.domain.ODataEntitySetIterator; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.core.uri.URIUtils; -import org.apache.olingo.client.core.op.ResourceFactory; +import org.apache.olingo.commons.core.op.ResourceFactory; import static org.junit.Assert.assertNotNull; import org.junit.Test; diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java index 792ddb750..c6fd0d8df 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntitySetTest.java @@ -27,7 +27,7 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.commons.api.domain.ODataEntitySet; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.client.core.op.ResourceFactory; +import org.apache.olingo.commons.core.op.ResourceFactory; import org.junit.Test; public class EntitySetTest extends AbstractTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java index d8f02a6d1..b61598864 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/EntityTest.java @@ -29,7 +29,7 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.domain.ODataProperty; import org.apache.olingo.commons.api.format.ODataPubFormat; import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.client.core.op.ResourceFactory; +import org.apache.olingo.commons.core.op.ResourceFactory; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.GeospatialCollection; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/op/CommonODataDeserializer.java similarity index 80% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/op/CommonODataDeserializer.java index 5b01fa3d0..dfefb7890 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/CommonODataDeserializer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/op/CommonODataDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.op; +package org.apache.olingo.commons.api.op; import java.io.InputStream; import java.io.Serializable; @@ -24,27 +24,14 @@ import org.apache.olingo.commons.api.data.Entry; import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.data.Feed; import org.apache.olingo.commons.api.data.Property; -import org.apache.olingo.client.api.data.ServiceDocument; -import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.format.ODataPubFormat; /** - * Utility class for serialization. + * Interface for serialization. */ public interface CommonODataDeserializer extends Serializable { - XMLMetadata toMetadata(InputStream input); - - /** - * Gets the ServiceDocument object represented by the given InputStream. - * - * @param input stream to be de-serialized. - * @param format OData service document format. - * @return <tt>ServiceDocument</tt> object. - */ - ServiceDocument toServiceDocument(InputStream input, ODataFormat format); - /** * Gets a feed object from the given InputStream. * diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/op/ODataSerializer.java similarity index 98% rename from lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java rename to lib/commons-api/src/main/java/org/apache/olingo/commons/api/op/ODataSerializer.java index 811a07b1c..2a7befff2 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/op/ODataSerializer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/op/ODataSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.api.op; +package org.apache.olingo.commons.api.op; import java.io.OutputStream; import java.io.Serializable; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractJacksonTool.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractJacksonTool.java index 2d62a7d02..c5eda7a44 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractJacksonTool.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractJacksonTool.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.commons.core.op; import com.fasterxml.aalto.stax.InputFactoryImpl; import com.fasterxml.aalto.stax.OutputFactoryImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractODataDeserializer.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractODataDeserializer.java index ed49ca8b8..94c43da04 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractODataDeserializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.commons.core.op; import java.io.InputStream; import org.apache.olingo.commons.api.data.Entry; @@ -25,8 +25,8 @@ import org.apache.olingo.commons.api.data.Feed; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.format.ODataPubFormat; -import org.apache.olingo.client.api.op.CommonODataDeserializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.api.op.CommonODataDeserializer; import org.apache.olingo.commons.core.data.AtomDeserializer; import org.apache.olingo.commons.core.data.AtomEntryImpl; import org.apache.olingo.commons.core.data.AtomFeedImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractODataSerializer.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractODataSerializer.java index c31413927..6ce1fbfa0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/AbstractODataSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/AbstractODataSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.commons.core.op; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; @@ -30,8 +30,8 @@ import org.apache.olingo.commons.api.data.Feed; import org.apache.olingo.commons.api.data.Link; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.format.ODataFormat; -import org.apache.olingo.client.api.op.ODataSerializer; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.api.op.ODataSerializer; import org.apache.olingo.commons.core.data.AtomEntryImpl; import org.apache.olingo.commons.core.data.AtomFeedImpl; import org.apache.olingo.commons.core.data.AtomPropertyImpl; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/InjectableSerializerProvider.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/InjectableSerializerProvider.java similarity index 97% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/InjectableSerializerProvider.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/InjectableSerializerProvider.java index b9b5374f3..967f1e09a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/InjectableSerializerProvider.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/InjectableSerializerProvider.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.commons.core.op; import com.fasterxml.jackson.databind.SerializationConfig; import com.fasterxml.jackson.databind.SerializerProvider; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/ODataObjectFactoryImpl.java similarity index 99% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/ODataObjectFactoryImpl.java index e5e7aa3aa..5e9f9c1d3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ODataObjectFactoryImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/ODataObjectFactoryImpl.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.commons.core.op; import java.net.URI; import org.apache.olingo.commons.api.domain.ODataLinkType; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/ResourceFactory.java similarity index 98% rename from lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java rename to lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/ResourceFactory.java index 525114ea5..e585b2d20 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/ResourceFactory.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/op/ResourceFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.client.core.op; +package org.apache.olingo.commons.core.op; import org.apache.olingo.commons.api.data.Entry; import org.apache.olingo.commons.api.data.Feed;