From 8f8cc3c94d252c95cd4d95cf41d4ca1561b8218b Mon Sep 17 00:00:00 2001 From: Stephan Klevenz Date: Tue, 11 Mar 2014 14:25:42 +0100 Subject: [PATCH 1/2] [OLINGO-192] fix some remaining package issues --- .../org/apache/olingo/client/api/edm/ConcurrencyMode.java | 2 +- .../apache/olingo/client/api/edm/StoreGeneratedPattern.java | 2 +- .../org/apache/olingo/client/api/edm/xml/v3/Property.java | 4 ++-- .../apache/olingo/client/core/edm/xml/v3/PropertyImpl.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/ConcurrencyMode.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/ConcurrencyMode.java index 90a8f7bf7..2a2829488 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/ConcurrencyMode.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/ConcurrencyMode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.odata4.client.api.edm; +package org.apache.olingo.client.api.edm; public enum ConcurrencyMode { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/StoreGeneratedPattern.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/StoreGeneratedPattern.java index c081bdf59..d27ce3879 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/StoreGeneratedPattern.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/StoreGeneratedPattern.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.odata4.client.api.edm; +package org.apache.olingo.client.api.edm; public enum StoreGeneratedPattern { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java index 6536a2115..1d77f8e71 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Property.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v3; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.client.api.edm.StoreGeneratedPattern; import org.apache.olingo.client.api.edm.xml.CommonProperty; import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.odata4.client.api.edm.ConcurrencyMode; -import org.apache.olingo.odata4.client.api.edm.StoreGeneratedPattern; public interface Property extends CommonProperty { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java index 53b32306d..6d8918dd9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.core.edm.xml.v3; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.client.api.edm.StoreGeneratedPattern; import org.apache.olingo.client.api.edm.xml.v3.Property; import org.apache.olingo.client.core.edm.xml.AbstractProperty; import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.odata4.client.api.edm.ConcurrencyMode; -import org.apache.olingo.odata4.client.api.edm.StoreGeneratedPattern; public class PropertyImpl extends AbstractProperty implements Property { From 781a9fb8c1777ce6fabcd021255d2ffbb9f3b33f Mon Sep 17 00:00:00 2001 From: Stephan Klevenz Date: Tue, 11 Mar 2014 14:26:18 +0100 Subject: [PATCH 2/2] [OLINGO-192] fix some remaining package issues --- .../client/core/edm/xml/PropertyDeserializer.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 ce8e4aaee..6e874b442 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 @@ -18,20 +18,20 @@ */ package org.apache.olingo.client.core.edm.xml; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.databind.DeserializationContext; - import java.io.IOException; 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.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.odata4.client.api.edm.ConcurrencyMode; -import org.apache.olingo.odata4.client.api.edm.StoreGeneratedPattern; + +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.databind.DeserializationContext; public class PropertyDeserializer extends AbstractEdmDeserializer {