[OLINGO-161] Refactored Java package names

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/ODataConsumer.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api;
+package org.apache.olingo.odata4.client.api;
 
 import org.apache.olingo.odata4.commons.api.edm.Edm;
 import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
@@ -24,7 +24,7 @@ import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
 //TODO: Exceptionhandling
 public abstract class ODataConsumer {
 
-  private static final String IMPLEMENTATION = "org.apache.olingo.odata4.consumer.core.ODataConsumerImpl";
+  private static final String IMPLEMENTATION = "org.apache.olingo.odata4.client.core.ODataConsumerImpl";
 
   public static ODataConsumer create() {
     ODataConsumer instance;

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/AnnotationProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 public interface AnnotationProperty extends Property {
   String getValue();

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ComplexValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 import java.util.List;
 import java.util.Map;

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/ConsumerException.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 public class ConsumerException extends Exception {
 

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Entity.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 import java.util.List;
 import java.util.Map;

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/EntitySet.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 import java.util.List;
 

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/NavigationProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 public interface NavigationProperty extends Property {
 

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Property.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 public interface Property {
   String getName();

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Reader.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 import java.io.InputStream;
 

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/StructuralProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 import java.util.List;
 

odata4-lib/odata4-client-api/src/main/java/org/apache/olingo/odata4/client/api/deserializer/Value.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.api.deserializer;
+package org.apache.olingo.odata4.client.api.deserializer;
 
 public interface Value {
   boolean isComplex();

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/ODataConsumerImpl.java

@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core;
+package org.apache.olingo.odata4.client.core;
 
+import org.apache.olingo.odata4.client.api.ODataConsumer;
 import org.apache.olingo.odata4.commons.api.edm.Edm;
 import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
 import org.apache.olingo.odata4.commons.core.ODataCommonsCoreImpl;
-import org.apache.olingo.odata4.consumer.api.ODataConsumer;
 
 public class ODataConsumerImpl extends ODataConsumer {
 

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/AnnotationPropertyImpl.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty;
 
 public class AnnotationPropertyImpl implements AnnotationProperty {
 

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/ComplexValueImpl.java

@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.util.Collections;
 import java.util.Map;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue;
+import org.apache.olingo.odata4.client.api.deserializer.ComplexValue;
-import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Value;
+import org.apache.olingo.odata4.client.api.deserializer.Value;
 
 public class ComplexValueImpl extends PropertyCollection implements ComplexValue {
 

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntityImpl.java

@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.util.Map;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Entity;
+import org.apache.olingo.odata4.client.api.deserializer.Entity;
-import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Property;
+import org.apache.olingo.odata4.client.api.deserializer.Property;
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
 
 public class EntityImpl extends PropertyCollection implements Entity {
 

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetBuilder.java

@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.io.IOException;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet;
+import org.apache.olingo.odata4.client.api.deserializer.EntitySet;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/EntitySetImpl.java

@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.Entity;
+import org.apache.olingo.odata4.client.api.deserializer.Entity;
-import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet;
+import org.apache.olingo.odata4.client.api.deserializer.EntitySet;
 
 import com.fasterxml.jackson.core.JsonParseException;
 

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/JsonReader.java

@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.ConsumerException;
+import org.apache.olingo.odata4.client.api.deserializer.ConsumerException;
-import org.apache.olingo.odata4.consumer.api.deserializer.Entity;
+import org.apache.olingo.odata4.client.api.deserializer.Entity;
-import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet;
+import org.apache.olingo.odata4.client.api.deserializer.EntitySet;
-import org.apache.olingo.odata4.consumer.api.deserializer.Property;
+import org.apache.olingo.odata4.client.api.deserializer.Property;
-import org.apache.olingo.odata4.consumer.api.deserializer.Reader;
+import org.apache.olingo.odata4.client.api.deserializer.Reader;
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
 
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParseException;

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/NavigationPropertyImpl.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty;
 
 public class NavigationPropertyImpl implements NavigationProperty {
 

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PrimitiveValue.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.Value;
+import org.apache.olingo.odata4.client.api.deserializer.Value;
 
 public class PrimitiveValue implements Value {
 

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollection.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -24,10 +24,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Property;
+import org.apache.olingo.odata4.client.api.deserializer.Property;
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
 
 abstract class PropertyCollection {
   protected Map<String, AnnotationProperty> annotationProperties = new HashMap<String, AnnotationProperty>();

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/PropertyCollectionBuilder.java

@@ -16,20 +16,20 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.AnnotationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue;
+import org.apache.olingo.odata4.client.api.deserializer.ComplexValue;
-import org.apache.olingo.odata4.consumer.api.deserializer.Entity;
+import org.apache.olingo.odata4.client.api.deserializer.Entity;
-import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty;
+import org.apache.olingo.odata4.client.api.deserializer.NavigationProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Property;
+import org.apache.olingo.odata4.client.api.deserializer.Property;
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Value;
+import org.apache.olingo.odata4.client.api.deserializer.Value;
 
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.core.JsonParser;

odata4-lib/odata4-client-core/src/main/java/org/apache/olingo/odata4/client/core/deserializer/StructuralPropertyImpl.java

@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Value;
+import org.apache.olingo.odata4.client.api.deserializer.Value;
 
 public class StructuralPropertyImpl implements StructuralProperty {
 

odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/ODataConsumerTest.java

@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core;
+package org.apache.olingo.odata4.client.core;
 
+import org.apache.olingo.odata4.client.api.ODataConsumer;
 import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider;
-import org.apache.olingo.odata4.consumer.api.ODataConsumer;
 import org.junit.Before;
 import org.junit.Test;
 

odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderPerformance.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -25,11 +25,12 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue;
+import org.apache.olingo.odata4.client.api.deserializer.ComplexValue;
-import org.apache.olingo.odata4.consumer.api.deserializer.Property;
+import org.apache.olingo.odata4.client.api.deserializer.Property;
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Value;
+import org.apache.olingo.odata4.client.api.deserializer.Value;
-import org.apache.olingo.odata4.consumer.core.testutil.StringHelper;
+import org.apache.olingo.odata4.client.core.deserializer.JsonReader;
+import org.apache.olingo.odata4.client.core.testutil.StringHelper;
 import org.junit.Test;
 
 public class JsonReaderPerformance {

odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/deserializer/JsonReaderTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.deserializer;
+package org.apache.olingo.odata4.client.core.deserializer;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -31,13 +31,14 @@ import java.util.List;
 
 import junit.framework.Assert;
 
-import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue;
+import org.apache.olingo.odata4.client.api.deserializer.ComplexValue;
-import org.apache.olingo.odata4.consumer.api.deserializer.Entity;
+import org.apache.olingo.odata4.client.api.deserializer.Entity;
-import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet;
+import org.apache.olingo.odata4.client.api.deserializer.EntitySet;
-import org.apache.olingo.odata4.consumer.api.deserializer.Property;
+import org.apache.olingo.odata4.client.api.deserializer.Property;
-import org.apache.olingo.odata4.consumer.api.deserializer.Reader;
+import org.apache.olingo.odata4.client.api.deserializer.Reader;
-import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty;
+import org.apache.olingo.odata4.client.api.deserializer.StructuralProperty;
-import org.apache.olingo.odata4.consumer.api.deserializer.Value;
+import org.apache.olingo.odata4.client.api.deserializer.Value;
+import org.apache.olingo.odata4.client.core.deserializer.JsonReader;
 import org.junit.Test;
 
 public class JsonReaderTest {

odata4-lib/odata4-client-core/src/test/java/org/apache/olingo/odata4/client/core/testutil/StringHelper.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.consumer.core.testutil;
+package org.apache.olingo.odata4.client.core.testutil;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfo.java

@@ -17,7 +17,7 @@
  * under the License.
  ******************************************************************************/
 
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriInfo extends
     UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin,

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoAll.java

@@ -17,7 +17,7 @@
  * under the License.
  ******************************************************************************/
 
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriInfoAll {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoBatch.java

@@ -17,7 +17,7 @@
  * under the License.
  ******************************************************************************/
 
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriInfoBatch {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoCrossjoin.java

@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoEntityId.java

@@ -17,16 +17,16 @@
  * under the License.
  ******************************************************************************/
 
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import java.util.List;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.IdOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption;
 
 /**
  * Indicates a URL access to an single Entity

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoKind.java

@@ -17,7 +17,7 @@
  * under the License.
  ******************************************************************************/
 
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public enum UriInfoKind {
   all, batch, crossjoin, entityId, metadata, resource, service;

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoMetadata.java

@@ -17,9 +17,9 @@
  * under the License.
  ******************************************************************************/
 
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption;
 
 public interface UriInfoMetadata {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoResource.java

@@ -16,22 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import java.util.List;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.CustomQueryOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.CustomQueryOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.ExpandOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.ExpandOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.FormatOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.FormatOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.IdOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.IdOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.InlineCountOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.InlineCountOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.SearchOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.SelectOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.SelectOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipTokenOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.SkipTokenOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.TopOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption;
 
 public interface UriInfoResource {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriInfoService.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriInfoService {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriParameter.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
 
 public interface UriParameter {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResource.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriResource {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceAction.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmAction;
 import org.apache.olingo.odata4.commons.api.edm.EdmActionImport;

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceComplexProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmComplexType;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceCount.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriResourceCount extends UriResource {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceEntitySet.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceFunction.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceIt.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmType;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceKind.java

@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public enum UriResourceKind {
   action, complexProperty, count, entitySet, function, it, lambdaAll, lambdaAny,

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAll.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
 
 public interface UriResourceLambdaAll extends UriResourcePartTyped {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaAny.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
 
 public interface UriResourceLambdaAny extends UriResourcePartTyped {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceLambdaRef.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 
 public interface UriResourceLambdaRef extends UriResourcePartTyped {

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceNavigation.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePartTyped.java

@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmType;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourcePrimitiveProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriResourcePrimitiveProperty extends UriResourceProperty {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmProperty;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRef.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriResourceRef extends UriResource {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceRoot.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 /**
  * Class indicating the $root reference. $root may be used within filter to

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceSingleton.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;
 import org.apache.olingo.odata4.commons.api.edm.EdmSingleton;

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceStartingTypeFilter.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmType;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/UriResourceValue.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri;
+package org.apache.olingo.odata4.server.api.uri;
 
 public interface UriResourceValue extends UriResource {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionNode.java

@@ -16,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.optiontree;
+package org.apache.olingo.odata4.server.api.uri.optiontree;
 
 import java.util.List;
 
-import org.apache.olingo.odata4.producer.api.uri.UriResourceProperty;
+import org.apache.olingo.odata4.server.api.uri.UriResourceProperty;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.FilterOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.FilterOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.InlineCountOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.InlineCountOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.OrderByOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.OrderByOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.SearchOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.SearchOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.SkipOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.SkipOption;
-import org.apache.olingo.odata4.producer.api.uri.queryoption.TopOption;
+import org.apache.olingo.odata4.server.api.uri.queryoption.TopOption;
 
 /**
  * Contains the merged $expand and $select options

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/optiontree/OptionProperty.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.optiontree;
+package org.apache.olingo.odata4.server.api.uri.optiontree;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmNavigationProperty;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/AliasQueryOption.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
 
 public interface AliasQueryOption extends QueryOption {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/CustomQueryOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface CustomQueryOption extends QueryOption {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExceptionVisitExpand.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public class ExceptionVisitExpand extends Exception {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandItem.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
-import org.apache.olingo.odata4.producer.api.uri.UriInfoResource;
+import org.apache.olingo.odata4.server.api.uri.UriInfoResource;
 
 public interface ExpandItem {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/ExpandOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FilterOption.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
 
 public interface FilterOption extends SystemQueryOption {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/FormatOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface FormatOption extends SystemQueryOption {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/IdOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface IdOption extends SystemQueryOption {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/InlineCountOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface InlineCountOption extends SystemQueryOption {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/LevelsExpandOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface LevelsExpandOption {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByItem.java

@@ -17,9 +17,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.expression.Expression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.expression.Expression;
 
 public interface OrderByItem {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/OrderByOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/QueryOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface QueryOption {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SearchOption.java

@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
-import org.apache.olingo.odata4.producer.api.uri.queryoption.search.SearchExpression;
+import org.apache.olingo.odata4.server.api.uri.queryoption.search.SearchExpression;
 
 public interface SearchOption extends SystemQueryOption {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectItem.java

@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
-import org.apache.olingo.odata4.producer.api.uri.UriInfoResource;
+import org.apache.olingo.odata4.server.api.uri.UriInfoResource;
 
 public interface SelectItem {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SelectOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface SkipOption extends SystemQueryOption {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SkipTokenOption.java

@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface SkipTokenOption extends SystemQueryOption {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SupportedQueryOptions.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public enum SupportedQueryOptions {
   FILTER("$filter"),

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/SystemQueryOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface SystemQueryOption extends QueryOption {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/TopOption.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption;
+package org.apache.olingo.odata4.server.api.uri.queryoption;
 
 public interface TopOption extends SystemQueryOption {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/AliasExpression.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public interface AliasExpression  extends Expression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/BinaryExpression.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public interface BinaryExpression extends Expression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Constant.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmType;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Enumeration.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExceptionVisitExpression.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public class ExceptionVisitExpression extends Exception {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Expression.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public interface Expression extends VisitableExression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/ExpressionVisitor.java

@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 import java.util.List;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmEnumType;
 import org.apache.olingo.odata4.commons.api.edm.EdmType;
 import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException;
-import org.apache.olingo.odata4.producer.api.uri.UriInfoResource;
+import org.apache.olingo.odata4.server.api.uri.UriInfoResource;
 
 public interface ExpressionVisitor<T> {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/LambdaRef.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public interface LambdaRef extends Expression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Literal.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public interface Literal extends Expression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/Member.java

@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmType;
-import org.apache.olingo.odata4.producer.api.uri.UriInfoResource;
+import org.apache.olingo.odata4.server.api.uri.UriInfoResource;
 
 public interface Member extends Expression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/MethodCall.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 import java.util.List;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedBinaryOperators.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public enum SupportedBinaryOperators {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedConstants.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public enum SupportedConstants {
   

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedMethodCalls.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public enum SupportedMethodCalls {
   CONTAINS("contains"), STARTSWITH("startswith"), ENDSWITH("endswith"), LENGTH("length"),

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/SupportedUnaryOperators.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public enum SupportedUnaryOperators {
   MINUS("-"), NOT("not");

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/TypeLiteral.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 import org.apache.olingo.odata4.commons.api.edm.EdmType;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/UnaryOperator.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 public interface UnaryOperator extends Expression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/expression/VisitableExression.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.expression;
+package org.apache.olingo.odata4.server.api.uri.queryoption.expression;
 
 import org.apache.olingo.odata4.commons.api.exception.ODataApplicationException;
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchBinary.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.search;
+package org.apache.olingo.odata4.server.api.uri.queryoption.search;
 
 public interface SearchBinary extends SearchExpression {
 

odata4-lib/odata4-server-api/src/main/java/org/apache/olingo/odata4/server/api/uri/queryoption/search/SearchExpression.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  ******************************************************************************/
-package org.apache.olingo.odata4.producer.api.uri.queryoption.search;
+package org.apache.olingo.odata4.server.api.uri.queryoption.search;
 
 public interface SearchExpression {