You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/03/16 06:42:00 UTC

git commit: [OLINGO-191] change package name: part 2 of 1.data->data.shared, 2, data.v4->data

Repository: incubator-olingo-odata4
Updated Branches:
  refs/heads/olingo191 b864f4454 -> 781cd729d


[OLINGO-191] change package name: part 2 of 1.data->data.shared, 2, data.v4->data


Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/781cd729
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/781cd729
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/781cd729

Branch: refs/heads/olingo191
Commit: 781cd729d26520335f4312f7a3f2edb4e2e8550e
Parents: b864f44
Author: challenh <ch...@apache.org>
Authored: Sun Mar 16 13:41:01 2014 +0800
Committer: challenh <ch...@apache.org>
Committed: Sun Mar 16 13:41:01 2014 +0800

----------------------------------------------------------------------
 .../core/data/AbstractServiceDocument.java      | 89 ++++++++++++++++++++
 .../core/data/JSONServiceDocumentImpl.java      | 43 ++++++++++
 .../core/data/XMLServiceDocumentImpl.java       | 29 +++++++
 .../shared/JSONServiceDocumentDeserializer.java |  6 +-
 .../shared/XMLServiceDocumentDeserializer.java  |  8 +-
 .../core/data/v4/AbstractServiceDocument.java   | 89 --------------------
 .../core/data/v4/JSONServiceDocumentImpl.java   | 43 ----------
 .../core/data/v4/XMLServiceDocumentImpl.java    | 29 -------
 .../core/op/impl/ODataV3DeserializerImpl.java   |  2 +-
 .../core/op/impl/ODataV4DeserializerImpl.java   |  4 +-
 10 files changed, 171 insertions(+), 171 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractServiceDocument.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractServiceDocument.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractServiceDocument.java
new file mode 100644
index 0000000..d0e694d
--- /dev/null
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/AbstractServiceDocument.java
@@ -0,0 +1,89 @@
+/*
+ * 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.core.data;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.olingo.client.api.data.ServiceDocumentItem;
+
+public abstract class AbstractServiceDocument
+        extends org.apache.olingo.client.core.data.shared.AbstractServiceDocument {
+
+  private URI baseURI;
+
+  private String metadataContext;
+
+  private String metadataETag;
+
+  private List<ServiceDocumentItem> functionImports = new ArrayList<ServiceDocumentItem>();
+
+  private List<ServiceDocumentItem> singletons = new ArrayList<ServiceDocumentItem>();
+
+  private List<ServiceDocumentItem> relatedServiceDocuments = new ArrayList<ServiceDocumentItem>();
+
+  @Override
+  public URI getBaseURI() {
+    return this.baseURI;
+  }
+
+  /**
+   * Sets base URI.
+   *
+   * @param baseURI base URI.
+   */
+  public void setBaseURI(final URI baseURI) {
+    this.baseURI = baseURI;
+  }
+
+  @Override
+  public String getMetadataContext() {
+    return metadataContext;
+  }
+
+  public void setMetadataContext(final String metadataContext) {
+    this.metadataContext = metadataContext;
+  }
+
+  @Override
+  public String getMetadataETag() {
+    return metadataETag;
+  }
+
+  public void setMetadataETag(final String metadataETag) {
+    this.metadataETag = metadataETag;
+  }
+
+  @Override
+  public List<ServiceDocumentItem> getFunctionImports() {
+    return functionImports;
+  }
+
+  @Override
+  public List<ServiceDocumentItem> getSingletons() {
+    return singletons;
+  }
+
+  @Override
+  public List<ServiceDocumentItem> getRelatedServiceDocuments() {
+    return relatedServiceDocuments;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentImpl.java
new file mode 100644
index 0000000..fd26a77
--- /dev/null
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentImpl.java
@@ -0,0 +1,43 @@
+/*
+ * 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.core.data;
+
+import org.apache.olingo.client.api.data.ServiceDocument;
+import org.apache.olingo.client.api.uri.SegmentType;
+import org.apache.olingo.client.core.data.shared.JSONServiceDocumentDeserializer;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import java.net.URI;
+
+@JsonDeserialize(using = JSONServiceDocumentDeserializer.class)
+public class JSONServiceDocumentImpl extends AbstractServiceDocument implements ServiceDocument {
+
+  @Override
+  public URI getBaseURI() {
+    URI baseURI = null;
+    if (getMetadataContext() != null) {
+      final String metadataURI = getMetadataContext();
+      baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue())));
+    }
+
+    return baseURI;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentImpl.java
new file mode 100644
index 0000000..deb294e
--- /dev/null
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/XMLServiceDocumentImpl.java
@@ -0,0 +1,29 @@
+/*
+ * 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.core.data;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+import org.apache.olingo.client.api.data.ServiceDocument;
+import org.apache.olingo.client.core.data.shared.XMLServiceDocumentDeserializer;
+
+@JsonDeserialize(using = XMLServiceDocumentDeserializer.class)
+public class XMLServiceDocumentImpl extends AbstractServiceDocument implements ServiceDocument {
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/JSONServiceDocumentDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/JSONServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/JSONServiceDocumentDeserializer.java
index e40fa36..9f96f19 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/JSONServiceDocumentDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/JSONServiceDocumentDeserializer.java
@@ -41,7 +41,7 @@ public class JSONServiceDocumentDeserializer extends ODataJacksonDeserializer<Ab
 
     final AbstractServiceDocument serviceDocument = ODataServiceVersion.V30 == client.getServiceVersion()
             ? new org.apache.olingo.client.core.data.v3.JSONServiceDocumentImpl()
-            : new org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl();
+            : new org.apache.olingo.client.core.data.JSONServiceDocumentImpl();
 
     if (tree.hasNonNull(ODataConstants.JSON_METADATA)
             && serviceDocument instanceof org.apache.olingo.client.core.data.v3.JSONServiceDocumentImpl) {
@@ -50,9 +50,9 @@ public class JSONServiceDocumentDeserializer extends ODataJacksonDeserializer<Ab
               setMetadata(tree.get(ODataConstants.JSON_METADATA).textValue());
     }
     if (tree.hasNonNull(ODataConstants.JSON_CONTEXT)
-            && serviceDocument instanceof org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl) {
+            && serviceDocument instanceof org.apache.olingo.client.core.data.JSONServiceDocumentImpl) {
 
-      ((org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl) serviceDocument).
+      ((org.apache.olingo.client.core.data.JSONServiceDocumentImpl) serviceDocument).
               setMetadataContext(tree.get(ODataConstants.JSON_CONTEXT).textValue());
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/XMLServiceDocumentDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/XMLServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/XMLServiceDocumentDeserializer.java
index c0c2f4b..dbeb10d 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/XMLServiceDocumentDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/shared/XMLServiceDocumentDeserializer.java
@@ -71,7 +71,7 @@ public class XMLServiceDocumentDeserializer extends ODataJacksonDeserializer<Ser
 
     final AbstractServiceDocument sdoc = ODataServiceVersion.V30 == client.getServiceVersion()
             ? new org.apache.olingo.client.core.data.v3.XMLServiceDocumentImpl()
-            : new org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl();
+            : new org.apache.olingo.client.core.data.XMLServiceDocumentImpl();
 
     for (; jp.getCurrentToken() != JsonToken.END_OBJECT
             || !"service".equals(((FromXmlParser) jp).getStaxReader().getLocalName()); jp.nextToken()) {
@@ -83,14 +83,14 @@ public class XMLServiceDocumentDeserializer extends ODataJacksonDeserializer<Ser
             ((org.apache.olingo.client.core.data.v3.XMLServiceDocumentImpl) sdoc).
                     setBaseURI(URI.create(jp.nextTextValue()));
           } else {
-            ((org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl) sdoc).
+            ((org.apache.olingo.client.core.data.XMLServiceDocumentImpl) sdoc).
                     setBaseURI(URI.create(jp.nextTextValue()));
           }
         } else if ("context".equals(jp.getCurrentName())) {
-          ((org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl) sdoc).
+          ((org.apache.olingo.client.core.data.XMLServiceDocumentImpl) sdoc).
                   setMetadataContext(jp.nextTextValue());
         } else if ("metadata-etag".equals(jp.getCurrentName())) {
-          ((org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl) sdoc).
+          ((org.apache.olingo.client.core.data.XMLServiceDocumentImpl) sdoc).
                   setMetadataETag(jp.nextTextValue());
         } else if ("workspace".equals(jp.getCurrentName())) {
           jp.nextToken();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/AbstractServiceDocument.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/AbstractServiceDocument.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/AbstractServiceDocument.java
deleted file mode 100644
index 9f51b4d..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/AbstractServiceDocument.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * 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.core.data.v4;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.olingo.client.api.data.ServiceDocumentItem;
-
-public abstract class AbstractServiceDocument
-        extends org.apache.olingo.client.core.data.shared.AbstractServiceDocument {
-
-  private URI baseURI;
-
-  private String metadataContext;
-
-  private String metadataETag;
-
-  private List<ServiceDocumentItem> functionImports = new ArrayList<ServiceDocumentItem>();
-
-  private List<ServiceDocumentItem> singletons = new ArrayList<ServiceDocumentItem>();
-
-  private List<ServiceDocumentItem> relatedServiceDocuments = new ArrayList<ServiceDocumentItem>();
-
-  @Override
-  public URI getBaseURI() {
-    return this.baseURI;
-  }
-
-  /**
-   * Sets base URI.
-   *
-   * @param baseURI base URI.
-   */
-  public void setBaseURI(final URI baseURI) {
-    this.baseURI = baseURI;
-  }
-
-  @Override
-  public String getMetadataContext() {
-    return metadataContext;
-  }
-
-  public void setMetadataContext(final String metadataContext) {
-    this.metadataContext = metadataContext;
-  }
-
-  @Override
-  public String getMetadataETag() {
-    return metadataETag;
-  }
-
-  public void setMetadataETag(final String metadataETag) {
-    this.metadataETag = metadataETag;
-  }
-
-  @Override
-  public List<ServiceDocumentItem> getFunctionImports() {
-    return functionImports;
-  }
-
-  @Override
-  public List<ServiceDocumentItem> getSingletons() {
-    return singletons;
-  }
-
-  @Override
-  public List<ServiceDocumentItem> getRelatedServiceDocuments() {
-    return relatedServiceDocuments;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/JSONServiceDocumentImpl.java
----------------------------------------------------------------------
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
deleted file mode 100644
index 4dddc23..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/JSONServiceDocumentImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.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.shared.JSONServiceDocumentDeserializer;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import java.net.URI;
-
-@JsonDeserialize(using = JSONServiceDocumentDeserializer.class)
-public class JSONServiceDocumentImpl extends AbstractServiceDocument implements ServiceDocument {
-
-  @Override
-  public URI getBaseURI() {
-    URI baseURI = null;
-    if (getMetadataContext() != null) {
-      final String metadataURI = getMetadataContext();
-      baseURI = URI.create(metadataURI.substring(0, metadataURI.indexOf(SegmentType.METADATA.getValue())));
-    }
-
-    return baseURI;
-  }
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/XMLServiceDocumentImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/XMLServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/XMLServiceDocumentImpl.java
deleted file mode 100644
index 3cbdbe3..0000000
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/v4/XMLServiceDocumentImpl.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.core.data.v4;
-
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-
-import org.apache.olingo.client.api.data.ServiceDocument;
-import org.apache.olingo.client.core.data.shared.XMLServiceDocumentDeserializer;
-
-@JsonDeserialize(using = XMLServiceDocumentDeserializer.class)
-public class XMLServiceDocumentImpl extends AbstractServiceDocument implements ServiceDocument {
-
-}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV3DeserializerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV3DeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV3DeserializerImpl.java
index a5c6e95..ad59ee3 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV3DeserializerImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV3DeserializerImpl.java
@@ -25,8 +25,8 @@ import org.apache.olingo.client.api.ODataClient;
 import org.apache.olingo.client.api.data.ServiceDocument;
 import org.apache.olingo.client.api.format.ODataFormat;
 import org.apache.olingo.client.api.op.ODataV3Deserializer;
+import org.apache.olingo.client.core.data.XMLServiceDocumentImpl;
 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;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/781cd729/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV4DeserializerImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV4DeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV4DeserializerImpl.java
index 29bab9e..877e533 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV4DeserializerImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/op/impl/ODataV4DeserializerImpl.java
@@ -26,8 +26,8 @@ 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.client.api.op.ODataV4Deserializer;
-import org.apache.olingo.client.core.data.v4.JSONServiceDocumentImpl;
-import org.apache.olingo.client.core.data.v4.XMLServiceDocumentImpl;
+import org.apache.olingo.client.core.data.JSONServiceDocumentImpl;
+import org.apache.olingo.client.core.data.XMLServiceDocumentImpl;
 import org.apache.olingo.client.core.edm.xml.EdmxImpl;
 import org.apache.olingo.client.core.edm.xml.XMLMetadataImpl;
 import org.apache.olingo.client.core.op.impl.AbstractODataDeserializer;