diff --git a/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java b/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java index b6605e702..c11a38fc6 100644 --- a/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java +++ b/ext/client-core-android/src/main/java/org/apache/olingo/client/core/android/http/AndroidHttpClientFactory.java @@ -19,11 +19,12 @@ package org.apache.olingo.client.core.android.http; import android.net.http.AndroidHttpClient; -import java.net.URI; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.http.AbstractHttpClientFactory; +import java.net.URI; + public class AndroidHttpClientFactory extends AbstractHttpClientFactory { private static final long serialVersionUID = -5224104561624556177L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java index 361109075..e20ab409b 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/Service.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.ext.proxy; -import java.lang.reflect.Proxy; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - import org.apache.olingo.client.api.CommonEdmEnabledODataClient; import org.apache.olingo.client.core.ODataClientFactory; import org.apache.olingo.commons.api.format.ODataFormat; @@ -31,6 +27,10 @@ import org.apache.olingo.ext.proxy.commons.NonTransactionalPersistenceManagerImp import org.apache.olingo.ext.proxy.commons.TransactionalPersistenceManagerImpl; import org.apache.olingo.ext.proxy.context.Context; +import java.lang.reflect.Proxy; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + /** * Entry point for proxy mode, gives access to entity container instances. * diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java index 8740d07be..9c2494a54 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AbstractEntityKey.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.ext.proxy.api; -import java.io.Serializable; 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 java.io.Serializable; + public abstract class AbstractEntityKey implements Serializable { private static final long serialVersionUID = 1662634743346775238L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java index eb05a4e8e..11c08e7dd 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/AsyncCall.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.ext.proxy.api; +import org.apache.olingo.client.api.Configuration; + import java.util.concurrent.Callable; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.olingo.client.api.Configuration; public abstract class AsyncCall implements Future { diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java index a4efc222f..a03ed8995 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.ext.proxy.api; -import java.io.Serializable; import org.apache.olingo.client.api.uri.v4.URISearch; +import java.io.Serializable; + /** * Interface used to control search execution. * diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java index 51afe7940..590e56299 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/EnumType.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.ext.proxy.api.annotations; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; /** * Mark Java enum as EDM enum type. diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java index ad5a148c2..66b7b3052 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Operation.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.ext.proxy.api.annotations; +import org.apache.olingo.ext.proxy.api.OperationType; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.olingo.ext.proxy.api.OperationType; /** * Mark method as EDM function import. diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java index 86da39373..5b6a0a0b0 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/annotations/Property.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.ext.proxy.api.annotations; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.client.api.edm.StoreGeneratedPattern; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.client.api.edm.StoreGeneratedPattern; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; /** * Bind POJO field to EDM property. diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java index 5120b1861..edf0eb64d 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.reflect.Proxy; -import java.lang.reflect.Type; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.lang3.tuple.ImmutableTriple; import org.apache.commons.lang3.tuple.Triple; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; @@ -42,6 +37,12 @@ import org.apache.olingo.ext.proxy.api.Sort; import org.apache.olingo.ext.proxy.api.StructuredType; import org.apache.olingo.ext.proxy.utils.ClassUtils; +import java.lang.reflect.Proxy; +import java.lang.reflect.Type; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public abstract class AbstractEntityCollectionInvocationHandler< T extends StructuredType, EC extends AbstractEntityCollection> extends AbstractInvocationHandler { diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java index 83f53b96f..d06bfcd92 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractInvocationHandler.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Proxy; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; @@ -56,6 +45,18 @@ import org.apache.olingo.ext.proxy.context.Context; import org.apache.olingo.ext.proxy.utils.ClassUtils; import org.apache.olingo.ext.proxy.utils.CoreUtils; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Proxy; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + abstract class AbstractInvocationHandler implements InvocationHandler { private static final long serialVersionUID = 358520026931462958L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java index e68bfc173..50b1b5406 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.io.InputStream; -import java.lang.reflect.Proxy; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.header.ODataPreferences; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; @@ -52,6 +41,17 @@ import org.apache.olingo.ext.proxy.utils.CoreUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.InputStream; +import java.lang.reflect.Proxy; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + abstract class AbstractPersistenceManager implements PersistenceManager { /** diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java index b5204cf0e..b4b58d79a 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Proxy; -import java.lang.reflect.Type; -import java.net.URI; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import org.apache.commons.lang3.ArrayUtils; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; @@ -48,6 +38,17 @@ import org.apache.olingo.ext.proxy.utils.ClassUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Proxy; +import java.lang.reflect.Type; +import java.net.URI; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; + public abstract class AbstractStructuredInvocationHandler extends AbstractInvocationHandler { private static final long serialVersionUID = 2629912294765040037L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java index 890603acf..5a36dd93d 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatableInvocationHandler.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataLinkedComplexValue; @@ -36,6 +28,15 @@ import org.apache.olingo.ext.proxy.api.annotations.Term; import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; import org.apache.olingo.ext.proxy.utils.CoreUtils; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class AnnotatableInvocationHandler extends AbstractInvocationHandler implements Annotatable { private static final long serialVersionUID = 3111228269617223332L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java index e009f6afd..f87a0a5eb 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AnnotatationsInvocationHandler.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; import org.apache.olingo.ext.proxy.utils.ClassUtils; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; + public class AnnotatationsInvocationHandler extends AbstractInvocationHandler { private static final long serialVersionUID = -1993362719908718985L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java index f17f7609a..be6d4461d 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexFactoryInvocationHandler.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import org.apache.olingo.ext.proxy.api.OperationExecutor; import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.utils.ClassUtils; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; + class ComplexFactoryInvocationHandler extends AbstractInvocationHandler implements OperationExecutor { private static final long serialVersionUID = 2629912294765040027L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java index 4d1e61fc4..8d1c827e1 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/ComplexInvocationHandler.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import org.apache.olingo.client.api.CommonEdmEnabledODataClient; @@ -41,6 +34,14 @@ import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; import org.apache.olingo.ext.proxy.utils.ClassUtils; import org.apache.olingo.ext.proxy.utils.CoreUtils; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + public class ComplexInvocationHandler extends AbstractStructuredInvocationHandler { private static Pair, Class> init( diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java index 4c4c16b51..d57aab3f0 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityCollectionInvocationHandler.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.tuple.Triple; import org.apache.olingo.client.api.uri.CommonURIBuilder; @@ -38,6 +29,16 @@ import org.apache.olingo.ext.proxy.api.annotations.Namespace; import org.apache.olingo.ext.proxy.api.annotations.Term; import org.apache.olingo.ext.proxy.utils.CoreUtils; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + public class EntityCollectionInvocationHandler extends AbstractEntityCollectionInvocationHandler> implements AbstractEntityCollection { diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java index 5a42f3441..14b313c41 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityContainerInvocationHandler.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; import org.apache.commons.lang3.ArrayUtils; import org.apache.olingo.ext.proxy.Service; import org.apache.olingo.ext.proxy.api.annotations.EntityContainer; @@ -28,6 +25,10 @@ import org.apache.olingo.ext.proxy.api.annotations.EntitySet; import org.apache.olingo.ext.proxy.api.annotations.Singleton; import org.apache.olingo.ext.proxy.utils.ClassUtils; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; + public final class EntityContainerInvocationHandler extends AbstractInvocationHandler { private static final long serialVersionUID = 7379006755693410764L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java index 904080402..fbff5006c 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntityInvocationHandler.java @@ -18,23 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Proxy; -import java.lang.reflect.Type; -import java.net.URI; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; @@ -58,11 +41,27 @@ import org.apache.olingo.ext.proxy.api.annotations.Namespace; import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.annotations.Term; -import static org.apache.olingo.ext.proxy.commons.AbstractStructuredInvocationHandler.LOG; import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; import org.apache.olingo.ext.proxy.context.EntityUUID; import org.apache.olingo.ext.proxy.utils.CoreUtils; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Proxy; +import java.lang.reflect.Type; +import java.net.URI; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Set; +import java.util.TreeSet; + public class EntityInvocationHandler extends AbstractStructuredInvocationHandler implements Annotatable { private static final long serialVersionUID = 2629912294765040037L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java index 412c312f1..888ff38a5 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.io.Serializable; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.tuple.Triple; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; @@ -50,6 +43,13 @@ import org.apache.olingo.ext.proxy.utils.ClassUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.Serializable; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + class EntitySetInvocationHandler< T extends StructuredType, KEY extends Serializable, EC extends AbstractEntityCollection> extends AbstractEntityCollectionInvocationHandler diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java index 79655599e..5534c931d 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetIterator.java @@ -18,16 +18,17 @@ */ package org.apache.olingo.ext.proxy.commons; +import org.apache.commons.lang3.tuple.Triple; +import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; +import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; +import org.apache.olingo.ext.proxy.api.StructuredType; + import java.io.Serializable; import java.net.URI; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.NoSuchElementException; -import org.apache.commons.lang3.tuple.Triple; -import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; -import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; -import org.apache.olingo.ext.proxy.api.StructuredType; class EntitySetIterator> implements Iterator { diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java index 6a0127c1d..9bf14681e 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/NonTransactionalPersistenceManagerImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.util.Map; import org.apache.olingo.client.api.communication.request.ODataBasicRequest; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse; @@ -26,6 +25,8 @@ import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResp import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.ext.proxy.Service; +import java.util.Map; + /** * {@link org.apache.olingo.ext.proxy.api.PersistenceManager} implementation not using OData batch requests: any * read-write operation will be sent separately to the OData service when calling flush(); any intermediate diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java index bfd3f224f..a0ddf29c1 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/OperationInvocationHandler.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.net.URI; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.ODataOperation; @@ -42,6 +33,16 @@ import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; import org.apache.olingo.ext.proxy.utils.ClassUtils; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.net.URI; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + final class OperationInvocationHandler extends AbstractInvocationHandler implements OperationExecutor { private static final long serialVersionUID = 2629912294765040027L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PersistenceChanges.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PersistenceChanges.java index 159d36b76..c8d672539 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PersistenceChanges.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/PersistenceChanges.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.ext.proxy.commons; +import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; + import java.util.LinkedHashMap; import java.util.Map; -import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; public class PersistenceChanges { diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java index a7139e3ca..129fe47b6 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.net.URI; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.uri.v4.URIBuilder; import org.apache.olingo.client.api.uri.v4.URISearch; @@ -29,6 +28,8 @@ import org.apache.olingo.ext.proxy.api.Search; import org.apache.olingo.ext.proxy.api.StructuredType; import org.apache.olingo.ext.proxy.utils.ClassUtils; +import java.net.URI; + public class SearchImpl> implements Search { private static final long serialVersionUID = 4383858176507769973L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SingletonInvocationHandler.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SingletonInvocationHandler.java index 4e6d78bc4..fbd4833ba 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SingletonInvocationHandler.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SingletonInvocationHandler.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.io.Serializable; -import java.lang.reflect.Method; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractSingleton; +import java.io.Serializable; +import java.lang.reflect.Method; + public class SingletonInvocationHandler< T extends Serializable, KEY extends Serializable, EC extends AbstractEntityCollection> extends AbstractInvocationHandler diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java index bd781831b..3da30195a 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/TransactionalPersistenceManagerImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.ext.proxy.commons; -import java.util.Iterator; -import java.util.Map; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.ODataRequest; import org.apache.olingo.client.api.communication.request.ODataStreamedRequest; @@ -34,6 +32,9 @@ import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem; import org.apache.olingo.ext.proxy.Service; +import java.util.Iterator; +import java.util.Map; + /** * {@link org.apache.olingo.ext.proxy.api.PersistenceManager} implementation using OData batch requests to implement * high-level user transactions: all read-write operations will be packed in a batch request to the OData service when diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityContext.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityContext.java index ae6937d12..ed39aec8b 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityContext.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityContext.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.ext.proxy.context; +import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; + import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; /** * Entity context. diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java index 3c8daddc9..b96dc2df0 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityLinkDesc.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.ext.proxy.context; -import java.io.Serializable; -import java.util.Collection; -import java.util.Collections; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -28,6 +25,10 @@ import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.olingo.commons.api.domain.ODataLinkType; import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; + public class EntityLinkDesc implements Serializable { private static final long serialVersionUID = 704670372070370762L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityUUID.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityUUID.java index fb838040a..822e01d10 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityUUID.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/context/EntityUUID.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.ext.proxy.context; -import java.io.Serializable; -import java.net.URI; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ClassUtils; import org.apache.commons.lang3.builder.EqualsBuilder; @@ -28,6 +26,9 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.olingo.ext.proxy.api.StructuredType; +import java.io.Serializable; +import java.net.URI; + public class EntityUUID implements Serializable { private static final long serialVersionUID = 4855025769803086495L; diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ClassUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ClassUtils.java index f01fedcef..5e14f3fa2 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ClassUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/ClassUtils.java @@ -18,6 +18,14 @@ */ package org.apache.olingo.ext.proxy.utils; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; +import org.apache.olingo.ext.proxy.api.annotations.EntityType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.KeyRef; +import org.apache.olingo.ext.proxy.api.annotations.Namespace; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.lang.annotation.Annotation; import java.lang.reflect.AccessibleObject; import java.lang.reflect.Constructor; @@ -27,13 +35,6 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.util.HashSet; import java.util.Set; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public final class ClassUtils { diff --git a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java index 7ce154f3e..0e33398f4 100644 --- a/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java +++ b/ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/utils/CoreUtils.java @@ -18,20 +18,6 @@ */ package org.apache.olingo.ext.proxy.utils; -import java.lang.annotation.Annotation; -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Proxy; -import java.lang.reflect.Type; -import java.net.URI; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonEdmEnabledODataClient; @@ -70,6 +56,21 @@ import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.lang.annotation.Annotation; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Proxy; +import java.lang.reflect.Type; +import java.net.URI; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + public final class CoreUtils { /** diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java index 95bee13c8..572408e3b 100644 --- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java +++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractPOJOGenMojo.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.ext.pojogen; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.FileWriter; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.AbstractMojo; @@ -54,6 +42,19 @@ import org.apache.velocity.app.Velocity; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; import org.codehaus.plexus.util.FileUtils; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileWriter; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + public abstract class AbstractPOJOGenMojo extends AbstractMojo { /** diff --git a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java index c395f030d..c50671045 100644 --- a/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java +++ b/ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/AbstractUtility.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.ext.pojogen; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.olingo.commons.api.edm.Edm; @@ -47,6 +38,16 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + public abstract class AbstractUtility { protected static final String FC_TARGET_PATH = "fcTargetPath"; diff --git a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java index 756e1af6b..11fc000f4 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -18,49 +18,8 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URI; -import java.util.AbstractMap; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.ConcurrentModificationException; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.mail.Header; -import javax.mail.internet.MimeBodyPart; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; @@ -108,8 +67,47 @@ import org.apache.olingo.fit.utils.XMLUtilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; +import javax.mail.Header; +import javax.mail.internet.MimeBodyPart; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.NotFoundException; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedHashMap; +import javax.ws.rs.core.MultivaluedMap; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URI; +import java.util.AbstractMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.ConcurrentModificationException; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public abstract class AbstractServices { diff --git a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java index 8b050944a..011552e03 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3ActionOverloading.java @@ -18,11 +18,17 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Map; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.utils.AbstractUtilities; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.Commons; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; +import org.apache.olingo.fit.utils.FSManager; +import org.springframework.stereotype.Service; import javax.ws.rs.DefaultValue; import javax.ws.rs.GET; @@ -36,18 +42,11 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.utils.AbstractUtilities; -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.Commons; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.utils.FSManager; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Map; @Service @Path("/V30/ActionOverloading.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java index 1d8aa5617..aece8c2f1 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3KeyAsSegment.java @@ -18,10 +18,12 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.fit.methods.MERGE; +import org.apache.olingo.fit.methods.PATCH; +import org.apache.olingo.fit.utils.Constants; +import org.springframework.stereotype.Service; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -38,13 +40,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.fit.methods.MERGE; -import org.apache.olingo.fit.methods.PATCH; -import org.apache.olingo.fit.utils.Constants; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; @Service @Path("/V30/KeyAsSegment.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java index ff65308a9..540c0d87b 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3OpenType.java @@ -18,12 +18,15 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.regex.Matcher; -import java.util.regex.Pattern; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; +import org.apache.olingo.fit.utils.FSManager; +import org.springframework.stereotype.Service; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -39,16 +42,12 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.utils.FSManager; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Service @Path("/V30/OpenType.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java b/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java index 623130378..d74d0fda7 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3PrimitiveKeys.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.fit; -import java.io.IOException; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.FSManager; +import org.springframework.stereotype.Service; + import javax.ws.rs.GET; import javax.ws.rs.Path; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; - -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.FSManager; -import org.springframework.stereotype.Service; +import java.io.IOException; @Service @Path("/V30/PrimitiveKeys.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V3Services.java b/fit/src/main/java/org/apache/olingo/fit/V3Services.java index 69fbc84cc..217f01290 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V3Services.java +++ b/fit/src/main/java/org/apache/olingo/fit/V3Services.java @@ -18,14 +18,24 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.cxf.interceptor.InInterceptors; +import org.apache.cxf.jaxrs.ext.multipart.Attachment; +import org.apache.olingo.commons.api.data.EntitySet; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.methods.MERGE; +import org.apache.olingo.fit.methods.PATCH; +import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; +import org.apache.olingo.fit.utils.AbstractUtilities; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.Commons; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; +import org.apache.olingo.fit.utils.FSManager; +import org.apache.olingo.fit.utils.LinkInfo; +import org.springframework.stereotype.Service; import javax.mail.internet.MimeBodyPart; import javax.mail.internet.MimeMultipart; @@ -45,25 +55,14 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.cxf.interceptor.InInterceptors; -import org.apache.cxf.jaxrs.ext.multipart.Attachment; -import org.apache.olingo.commons.api.data.EntitySet; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.methods.MERGE; -import org.apache.olingo.fit.methods.PATCH; -import org.apache.olingo.fit.utils.AbstractUtilities; -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.Commons; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.utils.FSManager; -import org.apache.olingo.fit.utils.LinkInfo; -import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; @Service @Path("/V30/Static.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java index d98dedbdf..d71337771 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Demo.java @@ -18,10 +18,16 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.methods.PATCH; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; +import org.apache.olingo.fit.utils.FSManager; +import org.springframework.stereotype.Service; import javax.ws.rs.Consumes; import javax.ws.rs.DefaultValue; @@ -37,17 +43,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.methods.PATCH; -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.utils.FSManager; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; @Service @Path("/V40/Demo.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java index adfcdae12..847f740b9 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.fit.methods.PATCH; +import org.apache.olingo.fit.utils.Constants; +import org.springframework.stereotype.Service; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -38,12 +39,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.fit.methods.PATCH; -import org.apache.olingo.fit.utils.Constants; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; @Service @Path("/V40/KeyAsSegment.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java b/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java index 2a922c5b8..68727779f 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.fit; -import java.io.IOException; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; - import org.apache.cxf.interceptor.InInterceptors; +import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; import org.apache.olingo.fit.utils.ConstantKey; import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; import org.springframework.stereotype.Service; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; +import java.io.IOException; + @Service @Path("/V40/NorthWind.svc") @InInterceptors(classes = XHTTPMethodInterceptor.class) diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java b/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java index 92c9b8ebb..bf40657b0 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java @@ -18,17 +18,17 @@ */ package org.apache.olingo.fit; -import java.io.IOException; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; - import org.apache.cxf.interceptor.InInterceptors; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; import org.apache.olingo.fit.rest.ResolvingReferencesInterceptor; import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; import org.springframework.stereotype.Service; +import javax.ws.rs.Path; +import javax.ws.rs.core.Response; +import java.io.IOException; + @Service @Path("/V40/NorthWindExt.svc") @InInterceptors(classes = {XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class}) diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java b/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java index b43b03471..02dc88763 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.fit; -import java.io.IOException; - -import javax.ws.rs.Path; import org.apache.cxf.interceptor.InInterceptors; import org.apache.olingo.fit.rest.OAuth2InInterceptor; import org.springframework.stereotype.Service; +import javax.ws.rs.Path; +import java.io.IOException; + @Service @Path("/V40/OAuth2.svc") @InInterceptors(classes = {OAuth2InInterceptor.class}) diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java index feb53c847..f61289659 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java @@ -18,10 +18,15 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.utils.Accept; +import org.apache.olingo.fit.utils.ConstantKey; +import org.apache.olingo.fit.utils.Constants; +import org.apache.olingo.fit.utils.FSManager; +import org.springframework.stereotype.Service; import javax.ws.rs.Consumes; import javax.ws.rs.DELETE; @@ -37,16 +42,10 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.utils.Accept; -import org.apache.olingo.fit.utils.ConstantKey; -import org.apache.olingo.fit.utils.Constants; -import org.apache.olingo.fit.utils.FSManager; -import org.springframework.stereotype.Service; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; @Service @Path("/V40/OpenType.svc") diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Services.java b/fit/src/main/java/org/apache/olingo/fit/V4Services.java index 75c7f3c94..d41fda139 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Services.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Services.java @@ -18,41 +18,6 @@ */ package org.apache.olingo.fit; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.regex.Pattern; - -import javax.mail.internet.MimeBodyPart; -import javax.mail.internet.MimeMultipart; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.NotFoundException; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.UriInfo; - import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -76,6 +41,8 @@ import org.apache.olingo.commons.core.data.PropertyImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.fit.metadata.Metadata; import org.apache.olingo.fit.methods.PATCH; +import org.apache.olingo.fit.rest.ResolvingReferencesInterceptor; +import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; import org.apache.olingo.fit.utils.AbstractUtilities; import org.apache.olingo.fit.utils.Accept; import org.apache.olingo.fit.utils.Commons; @@ -83,10 +50,42 @@ import org.apache.olingo.fit.utils.ConstantKey; import org.apache.olingo.fit.utils.Constants; import org.apache.olingo.fit.utils.FSManager; import org.apache.olingo.fit.utils.LinkInfo; -import org.apache.olingo.fit.rest.ResolvingReferencesInterceptor; -import org.apache.olingo.fit.rest.XHTTPMethodInterceptor; import org.springframework.stereotype.Service; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMultipart; +import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; +import javax.ws.rs.DefaultValue; +import javax.ws.rs.GET; +import javax.ws.rs.HeaderParam; +import javax.ws.rs.NotFoundException; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import javax.ws.rs.core.Response.Status; +import javax.ws.rs.core.UriInfo; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.net.URI; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.regex.Pattern; + @Service @Path("/V40/Static.svc") @InInterceptors(classes = {XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class}) diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java index 0691b27d2..ca8128a69 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java +++ b/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.fit; -import java.io.IOException; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.fit.metadata.Metadata; import org.apache.olingo.fit.utils.Accept; @@ -35,6 +27,14 @@ import org.apache.olingo.fit.utils.FSManager; import org.apache.olingo.fit.utils.XMLUtilities; import org.springframework.stereotype.Service; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.io.IOException; + @Service @Path("/V40/Vocabularies.svc") public class V4Vocabularies { diff --git a/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java b/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java index 64c20a43b..31aa9c28d 100644 --- a/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java +++ b/fit/src/main/java/org/apache/olingo/fit/metadata/Metadata.java @@ -18,20 +18,6 @@ */ package org.apache.olingo.fit.metadata; -import java.io.InputStream; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLInputFactory; -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.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; @@ -41,6 +27,19 @@ import org.apache.olingo.fit.utils.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; +import java.io.InputStream; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + public class Metadata extends AbstractMetadataElement { /** diff --git a/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java b/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java index f70eb437f..bcbc09b66 100644 --- a/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java +++ b/fit/src/main/java/org/apache/olingo/fit/methods/MERGE.java @@ -18,13 +18,12 @@ */ package org.apache.olingo.fit.methods; +import javax.ws.rs.HttpMethod; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; - @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @HttpMethod("MERGE") diff --git a/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java b/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java index d4e6404ca..d859610e2 100644 --- a/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java +++ b/fit/src/main/java/org/apache/olingo/fit/methods/PATCH.java @@ -18,13 +18,12 @@ */ package org.apache.olingo.fit.methods; +import javax.ws.rs.HttpMethod; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import javax.ws.rs.HttpMethod; - @Target({ ElementType.METHOD }) @Retention(RetentionPolicy.RUNTIME) @HttpMethod("PATCH") diff --git a/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2InInterceptor.java b/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2InInterceptor.java index bddc6421f..d61d3f01a 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2InInterceptor.java +++ b/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2InInterceptor.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.rest; -import java.net.URI; -import java.util.List; -import java.util.Map; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; import org.apache.commons.lang3.StringUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; @@ -37,6 +31,13 @@ import org.apache.cxf.rs.security.oauth2.grants.code.AuthorizationCodeGrant; import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException; import org.apache.cxf.transport.http.AbstractHTTPDestination; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.MediaType; +import java.net.URI; +import java.util.List; +import java.util.Map; + public class OAuth2InInterceptor extends AbstractPhaseInterceptor { private static final OAuthClientUtils.Consumer OAUTH2_CONSUMER = diff --git a/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2Provider.java b/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2Provider.java index bd355150c..cfe25b9d3 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2Provider.java +++ b/fit/src/main/java/org/apache/olingo/fit/rest/OAuth2Provider.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.fit.rest; -import java.util.Collections; -import java.util.List; import org.apache.cxf.rs.security.oauth2.common.AccessTokenRegistration; import org.apache.cxf.rs.security.oauth2.common.Client; import org.apache.cxf.rs.security.oauth2.common.OAuthPermission; @@ -31,6 +29,9 @@ import org.apache.cxf.rs.security.oauth2.grants.code.ServerAuthorizationCodeGran import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException; import org.apache.cxf.rs.security.oauth2.tokens.bearer.BearerAccessToken; +import java.util.Collections; +import java.util.List; + public class OAuth2Provider implements AuthorizationCodeDataProvider { public static final String CLIENT_ID = "odataOAuth2SVC"; diff --git a/fit/src/main/java/org/apache/olingo/fit/rest/ResolvingReferencesInterceptor.java b/fit/src/main/java/org/apache/olingo/fit/rest/ResolvingReferencesInterceptor.java index b4cecbeca..6b882b60a 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rest/ResolvingReferencesInterceptor.java +++ b/fit/src/main/java/org/apache/olingo/fit/rest/ResolvingReferencesInterceptor.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.fit.rest; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URLDecoder; - import org.apache.commons.lang3.StringUtils; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; import org.apache.cxf.phase.Phase; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URLDecoder; + public class ResolvingReferencesInterceptor extends AbstractPhaseInterceptor { public ResolvingReferencesInterceptor() { diff --git a/fit/src/main/java/org/apache/olingo/fit/rest/ServiceNameResponseFilter.java b/fit/src/main/java/org/apache/olingo/fit/rest/ServiceNameResponseFilter.java index 70b9c3edf..31828b8f4 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rest/ServiceNameResponseFilter.java +++ b/fit/src/main/java/org/apache/olingo/fit/rest/ServiceNameResponseFilter.java @@ -18,17 +18,18 @@ */ package org.apache.olingo.fit.rest; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.fit.utils.Constants; + import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ContainerResponseContext; import javax.ws.rs.container.ContainerResponseFilter; import javax.ws.rs.ext.Provider; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.fit.utils.Constants; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; @Provider public class ServiceNameResponseFilter implements ContainerResponseFilter { diff --git a/fit/src/main/java/org/apache/olingo/fit/rest/StaticSecurityInterceptor.java b/fit/src/main/java/org/apache/olingo/fit/rest/StaticSecurityInterceptor.java index 1959cc2cc..e9fef0ce5 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rest/StaticSecurityInterceptor.java +++ b/fit/src/main/java/org/apache/olingo/fit/rest/StaticSecurityInterceptor.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.rest; -import java.security.Principal; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.Response; import org.apache.cxf.common.security.SimplePrincipal; import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; @@ -32,6 +26,13 @@ import org.apache.cxf.phase.Phase; import org.apache.cxf.security.SecurityContext; import org.apache.geronimo.mail.util.Base64; +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; +import java.security.Principal; +import java.util.List; +import java.util.Map; +import java.util.StringTokenizer; + public class StaticSecurityInterceptor extends AbstractPhaseInterceptor { private static final String AUTHORIZATION_PROPERTY = "Authorization"; diff --git a/fit/src/main/java/org/apache/olingo/fit/rest/XHTTPMethodInterceptor.java b/fit/src/main/java/org/apache/olingo/fit/rest/XHTTPMethodInterceptor.java index cacb0ea1f..63a6b48fe 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rest/XHTTPMethodInterceptor.java +++ b/fit/src/main/java/org/apache/olingo/fit/rest/XHTTPMethodInterceptor.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.fit.rest; -import java.util.List; -import java.util.Map; - import org.apache.cxf.interceptor.Fault; import org.apache.cxf.message.Message; import org.apache.cxf.phase.AbstractPhaseInterceptor; @@ -28,6 +25,9 @@ import org.apache.cxf.phase.Phase; import org.apache.olingo.fit.utils.ConstantKey; import org.apache.olingo.fit.utils.Constants; +import java.util.List; +import java.util.Map; + public class XHTTPMethodInterceptor extends AbstractPhaseInterceptor { public XHTTPMethodInterceptor() { diff --git a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java index af477b3a6..effe31dad 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java +++ b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewrite.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.fit.rproxy; -import java.util.Properties; - import org.esigate.Driver; import org.esigate.DriverConfiguration; import org.esigate.events.Event; @@ -30,6 +28,8 @@ import org.esigate.events.impl.RenderEvent; import org.esigate.extension.Extension; import org.esigate.util.HttpRequestHelper; +import java.util.Properties; + public class LinkRewrite implements Extension, IEventListener { private DriverConfiguration config; diff --git a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java index f0dd7621c..6e6d8b6e9 100644 --- a/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java +++ b/fit/src/main/java/org/apache/olingo/fit/rproxy/LinkRewriteRenderer.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.fit.rproxy; -import java.io.IOException; -import java.io.Writer; - import org.apache.http.HttpEntityEnclosingRequest; import org.esigate.Renderer; +import java.io.IOException; +import java.io.Writer; + public class LinkRewriteRenderer implements Renderer { private static final char SLASH = '/'; diff --git a/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java b/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java index 447e63257..bf932f715 100644 --- a/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java +++ b/fit/src/main/java/org/apache/olingo/fit/serializer/FITAtomDeserializer.java @@ -18,19 +18,18 @@ */ package org.apache.olingo.fit.serializer; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.core.serialization.AtomDeserializer; + +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLStreamException; import java.io.InputStream; import java.io.InputStreamReader; import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLStreamException; - -import org.apache.olingo.commons.api.Constants; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.commons.core.serialization.AtomDeserializer; - public class FITAtomDeserializer extends AtomDeserializer { private static final Charset ENCODING = Charset.forName(Constants.UTF8); diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java index 7de4656aa..7f97c8455 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/AbstractUtilities.java @@ -18,27 +18,6 @@ */ package org.apache.olingo.fit.utils; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; -import java.util.AbstractMap.SimpleEntry; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.ConcurrentModificationException; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.regex.Pattern; - -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.vfs2.FileObject; @@ -62,6 +41,26 @@ import org.apache.olingo.fit.serializer.FITAtomDeserializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.ws.rs.NotFoundException; +import javax.ws.rs.core.Response; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; +import java.util.AbstractMap.SimpleEntry; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.ConcurrentModificationException; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.regex.Pattern; + public abstract class AbstractUtilities { /** diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java b/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java index 67f10bca9..3477124d0 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/Accept.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.fit.utils; -import java.util.regex.Pattern; - import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.fit.UnsupportedMediaTypeException; +import java.util.regex.Pattern; + public enum Accept { TEXT(ContentType.TEXT_PLAIN.getMimeType(), ".txt"), diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java index 40d33f79a..7f90ecc76 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/Commons.java @@ -18,6 +18,23 @@ */ package org.apache.olingo.fit.utils; +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.codehaus.plexus.util.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -34,24 +51,6 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.tuple.ImmutablePair; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.codehaus.plexus.util.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; - public abstract class Commons { /** diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java b/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java index b6978812b..ce44ca501 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/Constants.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.fit.utils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; + import java.nio.charset.Charset; import java.nio.charset.CharsetDecoder; import java.nio.charset.CodingErrorAction; import java.util.EnumMap; import java.util.Map; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; - public class Constants { private final static Map v4constants = new EnumMap(ConstantKey.class); diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java index 805db4794..dc8e105e3 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/FSManager.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.fit.utils; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.util.EnumMap; -import java.util.Map; - -import javax.ws.rs.NotFoundException; - import org.apache.commons.io.IOUtils; import org.apache.commons.vfs2.FileObject; import org.apache.commons.vfs2.FileSelectInfo; @@ -47,6 +35,17 @@ import org.apache.olingo.commons.core.serialization.JsonSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.ws.rs.NotFoundException; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.io.OutputStreamWriter; +import java.util.EnumMap; +import java.util.Map; + public class FSManager { /** diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java index 833befd2a..7771596aa 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/JSONUtilities.java @@ -18,6 +18,20 @@ */ package org.apache.olingo.fit.utils; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.InjectableValues; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.fasterxml.jackson.databind.node.TextNode; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.metadata.NavigationProperty; + +import javax.ws.rs.NotFoundException; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -31,22 +45,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.NotFoundException; - -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.metadata.NavigationProperty; - -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.databind.InjectableValues; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.databind.node.TextNode; - public class JSONUtilities extends AbstractUtilities { private final ObjectMapper mapper; diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java b/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java index c30a8f3d4..e83dd81d9 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/MetadataLinkInfo.java @@ -18,13 +18,12 @@ */ package org.apache.olingo.fit.utils; +import javax.ws.rs.NotFoundException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.ws.rs.NotFoundException; - public class MetadataLinkInfo { private Map entitySets = new HashMap(); diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java b/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java index e2d948aa7..38a4c2d16 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/NavigationLinks.java @@ -18,6 +18,8 @@ */ package org.apache.olingo.fit.utils; +import org.apache.commons.io.IOUtils; + import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; @@ -26,8 +28,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.io.IOUtils; - public class NavigationLinks { private final Map> inlines = new HashMap>(); diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java b/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java index b3de7eeca..9b4635c8a 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/XMLEventReaderWrapper.java @@ -18,19 +18,18 @@ */ package org.apache.olingo.fit.utils; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.nio.charset.Charset; +import org.apache.commons.io.IOUtils; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; - -import org.apache.commons.io.IOUtils; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.nio.charset.Charset; public class XMLEventReaderWrapper implements XMLEventReader { diff --git a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java index dead232fc..f3295c428 100644 --- a/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java +++ b/fit/src/main/java/org/apache/olingo/fit/utils/XMLUtilities.java @@ -18,6 +18,26 @@ */ package org.apache.olingo.fit.utils; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.vfs2.FileObject; +import org.apache.commons.vfs2.FileSystemException; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.fit.metadata.Metadata; +import org.apache.olingo.fit.metadata.NavigationProperty; + +import javax.ws.rs.NotFoundException; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventFactory; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLEventWriter; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamConstants; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.File; @@ -39,27 +59,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.ws.rs.NotFoundException; -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventFactory; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLEventWriter; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamConstants; -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.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.commons.vfs2.FileObject; -import org.apache.commons.vfs2.FileSystemException; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.fit.metadata.Metadata; -import org.apache.olingo.fit.metadata.NavigationProperty; - public class XMLUtilities extends AbstractUtilities { protected static XMLInputFactory ifactory = null; diff --git a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java index a5a0b93bb..9ba4a52a3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/AbstractBaseTestITCase.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.fit; -import java.io.IOException; -import java.io.InputStream; -import java.io.StringWriter; - import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.commons.api.data.Entity; @@ -34,6 +30,10 @@ import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringWriter; + public abstract class AbstractBaseTestITCase { /** diff --git a/fit/src/test/java/org/apache/olingo/fit/CXFOAuth2HttpUriRequestFactory.java b/fit/src/test/java/org/apache/olingo/fit/CXFOAuth2HttpUriRequestFactory.java index 6102d8c3b..a682a5203 100644 --- a/fit/src/test/java/org/apache/olingo/fit/CXFOAuth2HttpUriRequestFactory.java +++ b/fit/src/test/java/org/apache/olingo/fit/CXFOAuth2HttpUriRequestFactory.java @@ -20,7 +20,6 @@ package org.apache.olingo.fit; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import java.net.URI; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; @@ -37,6 +36,8 @@ import org.apache.olingo.client.core.http.AbstractOAuth2HttpUriRequestFactory; import org.apache.olingo.client.core.http.OAuth2Exception; import org.apache.olingo.fit.rest.OAuth2Provider; +import java.net.URI; + public class CXFOAuth2HttpUriRequestFactory extends AbstractOAuth2HttpUriRequestFactory { private String code; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java index a80e1f534..ea1570c2f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AbstractTestITCase.java @@ -18,28 +18,31 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.client.api.v3.EdmEnabledODataClient; +import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.ext.proxy.Service; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice + .DefaultContainer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ContactDetails; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone; +import org.junit.BeforeClass; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.IOException; import java.util.Arrays; import java.util.Collections; -import org.apache.olingo.client.api.v3.EdmEnabledODataClient; -import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.ext.proxy.Service; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Aliases; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.BeforeClass; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public abstract class AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java index b3a85ae03..6405ad066 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ActionOverloadingTestITCase.java @@ -18,22 +18,29 @@ */ package org.apache.olingo.fit.proxy.v3; +import org.apache.olingo.client.api.v3.EdmEnabledODataClient; +import org.apache.olingo.commons.api.format.ContentType; +import org.apache.olingo.ext.proxy.Service; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice + .DefaultContainer; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .Employee; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .EmployeeCollection; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .OrderLineKey; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .SpecialEmployee; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .SpecialEmployeeCollection; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; -import org.apache.olingo.client.api.v3.EdmEnabledODataClient; -import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.ext.proxy.Service; //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.Employee; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.OrderLineKey; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; /** * This is the unit test class to check actions overloading. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java index 67ca58113..3b743b7d3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/AsyncTestITCase.java @@ -18,24 +18,28 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.ext.proxy.api.AsyncCall; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.Person; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .EmployeeCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ProductCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .SpecialEmployeeCollection; +import org.junit.Test; import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.apache.olingo.ext.proxy.api.AsyncCall; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.Person; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ProductCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; public class AsyncTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java index b3e0806cb..c7bfbca5a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/ContextTestITCase.java @@ -18,12 +18,20 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; +import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ContactDetails; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .CustomerInfo; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .OrderCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone; +import org.junit.Test; import java.lang.reflect.Proxy; import java.util.ArrayList; @@ -33,19 +41,15 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; -import org.apache.olingo.ext.proxy.context.AttachedEntityStatus; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Login; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; /** * This is the unit test class to check entity retrieve operations. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java index 59006f4d5..7620df2e7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityCreateTestITCase.java @@ -18,22 +18,24 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.apache.olingo.fit.proxy.v3.AbstractTestITCase.container; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .MessageKey; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .OrderCollection; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection; -import static org.junit.Assert.fail; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; /** * This is the unit test class to check entity create operations. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java index bc9b1790e..41f7fd090 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityRetrieveTestITCase.java @@ -18,48 +18,63 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.lang.reflect.Proxy; -import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Collection; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.Geospatial.Type; import org.apache.olingo.commons.api.edm.geo.MultiLineString; import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; -//CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.DefaultContainer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.AllSpatialTypes; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Contractor; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContractorCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice + .DefaultContainer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .AllSpatialTypes; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ComputerDetail; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ConcurrencyInfo; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ContactDetails; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .Contractor; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ContractorCollection; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerInfo; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .CustomerInfo; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .EmployeeCollection; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .MessageKey; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .OrderCollection; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Person; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.PersonCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .PersonCollection; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Phone; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployee; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection; -//CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .SpecialEmployee; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .SpecialEmployeeCollection; import org.junit.Test; +import java.lang.reflect.Proxy; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Collection; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +//CHECKSTYLE:OFF (Maven checkstyle) +//CHECKSTYLE:ON (Maven checkstyle) + /** * This is the unit test class to check entity retrieve operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java index d22f25fe4..f2eed83cf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntitySetTestITCase.java @@ -18,18 +18,18 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.util.Iterator; - import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Computer; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; import org.junit.Test; +import java.io.IOException; +import java.util.Iterator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check basic feed operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java index a7af5819d..30c56facd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/EntityUpdateTestITCase.java @@ -18,23 +18,27 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ConcurrencyInfo; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .MessageKey; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .OrderCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product; +import org.junit.Test; import java.lang.reflect.Proxy; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ConcurrencyInfo; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Message; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.MessageKey; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.OrderCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; /** * This is the unit test class to check entity update operations. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java index 91438bc71..ec34e1602 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/FilterTestITCase.java @@ -18,26 +18,31 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.ext.proxy.api.Sort; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.Person; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .CarCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .EmployeeCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .SpecialEmployeeCollection; +import org.junit.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.olingo.ext.proxy.api.Sort; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.Person; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CarCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.SpecialEmployeeCollection; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; public class FilterTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java index 6dd816b72..f588822f5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/InvokeTestITCase.java @@ -18,12 +18,21 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ComputerDetail; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ContactDetails; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .CustomerCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .Dimensions; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .EmployeeCollection; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product; +import org.junit.Test; import java.math.BigDecimal; import java.sql.Timestamp; @@ -35,18 +44,15 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.lang3.StringUtils; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ComputerDetail; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.ContactDetails; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Customer; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.CustomerCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Dimensions; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Employee; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.EmployeeCollection; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Product; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; public class InvokeTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java index 365021fc5..98763b969 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/MediaEntityTestITCase.java @@ -18,18 +18,18 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.io.IOUtils; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car; +import org.junit.Test; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import org.apache.commons.io.IOUtils; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Car; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; /** * This is the unit test class to check media entity retrieve operations. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java index 80bd207b6..ae1653d0c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/OpenTypeTestITCase.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.UUID; - import org.apache.olingo.client.api.v3.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.Service; @@ -40,6 +29,17 @@ import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.ope import org.junit.BeforeClass; import org.junit.Test; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check actions overloading. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java index bf6f349de..9d8329033 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PrimitiveKeysTestITCase.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.math.BigDecimal; -import java.util.UUID; - import org.apache.olingo.client.api.v3.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.Service; @@ -40,6 +34,12 @@ import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.service import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.EdmString; import org.junit.Test; +import java.math.BigDecimal; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * This is the unit test class to check basic feed operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java index 4bcd4b770..227ea69b3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/PropertyTestITCase.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.fit.proxy.v3; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Driver; import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.Order; import org.junit.Test; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + /** * This is the unit test class to check actions overloading. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java index c3ed03348..ca1c9528b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java index 2170e7a05..8e55c1a03 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java index cf2094479..b59e5fe35 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Car.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java index e2377ac9f..5117b47f6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Computer.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java index 0629bd48d..292a84da6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java index a7df35d75..219e17a26 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Customer.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java index b7e9b3909..fbf7896a2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java index 41e00d036..6ac94a1ad 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java @@ -19,30 +19,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.PersistenceManager; import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.PersistenceManager; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java index 79e22b6da..71037fc0e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Driver.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java index 800a80363..48d3c9ee8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java index 6fb13dacd..62f49aec7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/License.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java index 5c73853ab..c5877c617 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Login.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java index 6d48e0a5b..17a7bedeb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java index 922f2d18e..0ad7ad1d5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Message.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .MessageKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java index 66541e8c3..1e508db82 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java index 8c3ca63e9..d0a8d16cf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Order.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java index 059748781..ffa0f99d4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .OrderLineKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java index ed1bdf084..d566e76cd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PageView.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java index a52873ac1..79ec91b1a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Person.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java index 06e8cc5bd..e6856cee0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java index 15f018b44..322b4fac1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/Product.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java index 931c9045b..facdd4e00 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java index ee097616b..7c361c0ca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .ProductPhotoKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java index d1db4b4e9..736deed4c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types + .ProductReviewKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java index d48fd5e2d..cd15adb5b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java index d64c64a20..8bb7fa20a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Aliases") public interface Aliases diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java index de9616033..eebf6e18f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java index 896667729..6c4e90451 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AllSpatialCollectionTypesCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java index 0b0d001dd..f042fe475 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java index 93a10988a..7a0aadf56 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AllSpatialCollectionTypes_SimpleCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java index 43a2ccaad..adea75860 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java index 3bf95e605..177abda45 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AllSpatialTypesCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java index 14e8bf429..b995ad83b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AuditInfo") public interface AuditInfo diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java index 4425f6ce2..d0147acca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(OrderLineKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java index 36b4fc83f..2812958d3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(OrderLineKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java index 05eb4ff3e..11fc8ba6f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface BackOrderLine2Collection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java index c0ee3c0ac..1b675679b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface BackOrderLineCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java index dbefcdc12..c7ae9714d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Car.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java index c3e8d07bd..e66d23a8a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CarCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java index 726bfdeb2..557db094f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexToCategory") public interface ComplexToCategory diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java index 5b79ea0e4..352ce721d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java index 45644ce1a..9e24b1595 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ComputerCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java index a6e6a9155..b45d79000 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java index 143055819..e4fee1acc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ComputerDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java index 373a5c6ec..96b2a20c6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo") public interface ConcurrencyInfo diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java index 904437fb9..898f8daca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails") public interface ContactDetails diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java index 55f9b6fea..3afd8a2dd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java index b7dda7f12..5b009f13e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ContractorCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java index 257c37bf8..fa53a52c1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java index 8c4a2bba2..c6a070f06 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CustomerCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java index 473bd23a8..284f7e4bb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java index d249217fa..feb256c4d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CustomerInfoCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java index e5a817b25..5fa84d33e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Dimensions") public interface Dimensions diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java index d8afb5617..57485b13a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java index 789e59253..e96b5da8b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface DiscontinuedProductCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java index f668f7528..8da663031 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java index 3a2646d90..d2c2a9e7a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface DriverCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java index 2a8daeba2..ebc1a5212 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java index 9c1b99a62..890be41b2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java @@ -19,30 +19,13 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EmployeeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java index b7909e458..77abd8737 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java index ade8e0c44..4c53b878e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface LastLoginCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java index 2ddff8442..c0d1f427b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/License.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java index d9936d620..c4568aa27 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface LicenseCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java index 1f62c2dd7..6bbe9b6e0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Login.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java index 7e6c069ff..54dbba079 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface LoginCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java index c3d06da51..fa614b726 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java index c57680309..89863d300 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface MappedEntityTypeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java index 9d66eb253..b49a6e089 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Message.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(MessageKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java index b33747757..9c76089d3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java index 973917a2d..ce03c8669 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface MessageAttachmentCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java index b6dc3b388..477ddef0b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface MessageCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java index ade91b206..926899abd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class MessageKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java index fc29891bc..f782cc118 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Order.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java index af3db2790..c11cc7a54 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface OrderCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java index 0a88383d3..f3a4101d1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(OrderLineKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java index 3f40d3750..c534cc319 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface OrderLineCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java index 88ffd50ee..2bed34077 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class OrderLineKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java index 32fce40ec..fefed4ad3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java index d8284344c..998e624b3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PageViewCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java index 6bcf25c79..7ef3f7ca2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Person.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java index c07fa42ec..997b07b78 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PersonCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java index 77e9e2018..5f97bb501 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java index 43a2ecb75..e4bca79e2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PersonMetadataCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java index 57cefb961..f562df097 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Phone") public interface Phone diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java index 128e5b6d4..f23abeca9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/Product.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java index 570452f17..e623b5fdf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java index c39fdd1f6..f9ec30e25 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java index 0048515ca..d789f0d4b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java index 782163ca0..40718229e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java index 5b90b3e4e..4d58bdfb1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductPageViewCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java index 79bb03383..69bed011a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(ProductPhotoKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java index 35380c18a..0ca541819 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductPhotoCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java index b778fc5bb..8676c8390 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class ProductPhotoKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java index f66397ecf..2efe2f50b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(ProductReviewKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java index 384ca89cb..3d428bd58 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductReviewCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java index f62a5b1f2..b5bf92d60 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class ProductReviewKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java index b6011dabc..2b1170186 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java index 4ba40bb9b..a1569ec5a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface RSATokenCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java index fb1593170..42941e6b0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java index 0c499a25d..6d5aa8ca5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/actionoverloading/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java @@ -19,30 +19,13 @@ package org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.actionoverloading.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface SpecialEmployeeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java index 787d32833..9ef7b50cd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/DefaultContainer.java @@ -19,30 +19,7 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.PersistenceManager; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java index a0f73cc95..704372366 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/Row.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java index 8c8092136..a00ddaf34 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/RowIndex.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java index 95898741c..4d7ccb0cd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/ContactDetails.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails") public interface ContactDetails diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java index 1ef918ac7..167d1e258 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRow.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java index 37f01e4b7..504e54e16 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/IndexedRowCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface IndexedRowCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java index 22f8e157c..56d0e14c6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/Row.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java index fdfabba55..a3add669b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface RowCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java index 19a444fa4..2ce2771d0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndex.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV3") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java index e59ac0d61..7b13404cf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/opentype/microsoft/test/odata/services/opentypesservicev3/types/RowIndexCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.*; -import org.apache.olingo.fit.proxy.v3.opentype.microsoft.test.odata.services.opentypesservicev3.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface RowIndexCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java index d4f5a5264..b6c70b496 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBinarySet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java index 1d3acaeef..623a21242 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmBooleanSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java index 3b1002b20..768f94ff0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmByteSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java index c1025d7bf..cbc2cca21 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeOffsetSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java index d6624fa4a..5bcf225ca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDateTimeSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java index d1b8cd3f2..92b876e2f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDecimalSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java index 006ca4b71..f61b0f81c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmDoubleSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java index 709924c5b..a3c8277d9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmGuidSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java index 8efa8ca50..1cab070e9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt16Set.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java index ff4636472..fa1daf075 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt32Set.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java index 4fc0a34c2..045e87450 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmInt64Set.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java index 5ea2838f8..451de12e1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmSingleSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java index f256ba647..d24630bc5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmStringSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java index 5bb405c2f..ee235a693 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/EdmTimeSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java index 828c702c2..26aa288ce 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/Folders.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java index 35c7953f8..3e207fb9b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/TestContext.java @@ -19,30 +19,7 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.PersistenceManager; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "TestContext", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java index f4958c393..9ec1aa375 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinary.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java index 3ed9f2f92..db1c84a07 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBinaryCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmBinaryCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java index e673d74a2..520e8dfb6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBoolean.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java index a53bad850..ddd19d8ef 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmBooleanCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmBooleanCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java index fd203b8be..d72c93787 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByte.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java index b3d6a2444..7365e9bd1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmByteCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmByteCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java index a99640216..d480fae1b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTime.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java index 263018b7a..28d11653e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmDateTimeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java index 6cc672414..159bf9132 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffset.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java index 6a73014ec..cee41cfc4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDateTimeOffsetCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmDateTimeOffsetCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java index 962accac1..07a598307 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimal.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java index c55c92ed3..53abb5765 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDecimalCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmDecimalCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java index 89a67bc84..198881d07 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDouble.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java index d63ed3a63..b302d254d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmDoubleCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmDoubleCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java index eb08a288a..8814838f3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuid.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java index c84233b1c..3b5f05139 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmGuidCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmGuidCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java index 1cdc474c8..e42031c41 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java index fb244cd47..86a71dfd9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt16Collection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmInt16Collection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java index f7239b02c..6ddec13cc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java index 93f5d07b8..34a5e2da6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt32Collection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmInt32Collection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java index 9d4672926..cb2fda70d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java index e40038e6d..52a2de3be 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmInt64Collection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmInt64Collection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java index 7a61f8867..57435a318 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingle.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java index 4e15a20df..cf526b85e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmSingleCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmSingleCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java index 6ae550636..c139035fc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmString.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java index 74d2d5df0..6b9d753d1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmStringCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmStringCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java index ad9f1ea73..f8f749c07 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTime.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java index 5affcb9a7..76407c0c7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/EdmTimeCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EdmTimeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java index 9e37012e0..b412e19e7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/Folder.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.PrimitiveKeysService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java index 69755e5de..54db3db99 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/primitivekeys/microsoft/test/odata/services/primitivekeysservice/types/FolderCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.*; -import org.apache.olingo.fit.proxy.v3.primitivekeys.microsoft.test.odata.services.primitivekeysservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface FolderCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java index 09747279c..1672dd939 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoCollectionTypesSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java index 6708441e9..84a0307f9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/AllGeoTypesSet.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java index 1f20c150e..ef3154015 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Car.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java index 228c5305e..7e0da83d4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Computer.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java index 554453968..6a1138666 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ComputerDetail.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java index cf5fa72a1..012828568 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Customer.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java index 4b7465a27..c6f8ebd9a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/CustomerInfo.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java index 7ab4b4588..054d0a786 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/DefaultContainer.java @@ -19,30 +19,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.PersistenceManager; import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.PersistenceManager; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java index 0b5ecd05c..983661685 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Driver.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java index 92a63d025..63c077226 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/LastLogin.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java index bc310e5a9..8ed82f6a1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/License.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java index 16a093e7b..7d67cc298 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Login.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java index e8c33e889..8018d395c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MappedEntityType.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java index 76c752c00..3c56e97b0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Message.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .MessageKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java index 66785d41c..40d3f6a65 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/MessageAttachment.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java index af6162f6f..9c211014f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Order.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java index d9537bf4f..63ebf7d98 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/OrderLine.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .OrderLineKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java index cad66dbc2..8ffec09a8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PageView.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java index fe0d82052..377b6209d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Person.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java index 42c112c97..94b3b7e70 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/PersonMetadata.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java index c75a7fb1d..4a4e6d87e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/Product.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java index 76c6302ba..66f464553 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductDetail.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java index 334252878..c96f59e78 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductPhoto.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ProductPhotoKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java index 0a8bbedae..2f23056b7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/ProductReview.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types + .ProductReviewKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java index 8441bbc45..cc5b88e90 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/RSAToken.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java index ed9d092e2..bc63faa76 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Aliases.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Aliases") public interface Aliases diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java index ebfcc35b2..a04530c9e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java index 935be8c69..017b143c1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypesCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AllSpatialCollectionTypesCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java index 35c2c1022..9ae963cae 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_Simple.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java index b97514ead..257669160 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialCollectionTypes_SimpleCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AllSpatialCollectionTypes_SimpleCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java index 266291012..5e5d4e250 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypes.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java index a706f0dc6..511ca0b46 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AllSpatialTypesCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AllSpatialTypesCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java index f0914a87e..a3ed474c9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/AuditInfo.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "AuditInfo") public interface AuditInfo diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java index 15454e294..b75951174 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(OrderLineKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java index b79a6dcd5..3918140e8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(OrderLineKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java index 242e28a74..d95eb5e47 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLine2Collection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface BackOrderLine2Collection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java index eda7cdd0f..b0dbd6d6c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/BackOrderLineCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface BackOrderLineCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java index 00a75ef6b..f1723578d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Car.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java index 09ae161ef..86b2bade2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CarCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CarCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java index 42688c5a0..096801bc7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexToCategory.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexToCategory") public interface ComplexToCategory diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java index 3e89ef01a..cb4498104 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComplexWithAllPrimitiveTypes.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ComplexWithAllPrimitiveTypes") public interface ComplexWithAllPrimitiveTypes diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java index e82b930c2..72c168ec8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Computer.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java index a2b37550f..2ace25f0b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ComputerCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java index d83e5d86e..01bbe6ad3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetail.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java index 11e453be2..cea12863f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ComputerDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ComputerDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java index cc61be096..fb0a1b3ab 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ConcurrencyInfo.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ConcurrencyInfo") public interface ConcurrencyInfo diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java index 668beaa67..1c9f227bf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContactDetails.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "ContactDetails") public interface ContactDetails diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java index 3af8befe0..777bdb301 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Contractor.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java index 4a6046e4e..5be97f56d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ContractorCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ContractorCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java index 2d231c8fc..72b96b8e1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Customer.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java index 480de7ff2..f2f3d4e47 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CustomerCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java index a4668b0b0..4057d4719 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfo.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java index 9ff4b0695..4184e3e1f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/CustomerInfoCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CustomerInfoCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java index 0aa0509e4..e15ef2aa8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Dimensions.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Dimensions") public interface Dimensions diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java index 9ae443bff..356b46256 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProduct.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java index 61aa89828..fd5323521 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DiscontinuedProductCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface DiscontinuedProductCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java index cd47a68c0..2d9c98e6a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Driver.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java index ec7ec0992..2768dd72a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/DriverCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface DriverCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java index d44246442..7f8e0a8e8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Employee.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java index ed5df919f..f1613e633 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/EmployeeCollection.java @@ -19,30 +19,13 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EmployeeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java index d0248c651..580a4e04e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLogin.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java index 35619688b..d05edecdc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LastLoginCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface LastLoginCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java index d1ea559d7..6815a3ad7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/License.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java index 47b421a96..86084995f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LicenseCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface LicenseCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java index 754cf5089..f330af548 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Login.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java index 9920877fb..68fd0a018 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/LoginCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface LoginCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java index 886669aa1..5c0fbc6f2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityType.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java index 616d09a27..b19162f0a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MappedEntityTypeCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface MappedEntityTypeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java index 7472ff717..749257949 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Message.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(MessageKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java index f0f6eee24..e947bf226 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachment.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java index d78c3ff75..a6c4fd6b1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageAttachmentCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface MessageAttachmentCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java index 4bc4b888e..50ff549dd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface MessageCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java index 142f87cb9..dbd70b6bb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/MessageKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class MessageKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java index 456112157..5ccc04503 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Order.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java index 8a60cdc9b..61e8054b4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface OrderCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java index d4ebc1c1c..4e8b07dd1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLine.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(OrderLineKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java index 5bb869021..35eeda842 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface OrderLineCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java index 6363e8441..f9a1674d6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/OrderLineKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class OrderLineKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java index 07e832f89..a38ea74a3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageView.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java index 582c5e6cb..6137ecc25 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PageViewCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PageViewCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java index 9c0957c67..ff36f3c2a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Person.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java index 8b4e00bfa..a23df944a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PersonCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java index 11ddc8c9f..2657e0c6f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadata.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java index e9c783a2d..620f1be00 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/PersonMetadataCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PersonMetadataCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java index f9976c8a9..f1c90d656 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Phone.java @@ -19,29 +19,6 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; - - @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") @org.apache.olingo.ext.proxy.api.annotations.ComplexType(name = "Phone") public interface Phone diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java index 4801bef57..e8a4b29d0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/Product.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java index 84e336201..4d7bdad20 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java index 6fe595d88..6529f7361 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetail.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java index c52305577..bb4003eff 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java index a42972a3e..f9508aca6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageView.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java index 905fdf155..f3a116824 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPageViewCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductPageViewCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java index 4838e01e7..b8d2991c5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhoto.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(ProductPhotoKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java index 933fdd7fc..be4c02161 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductPhotoCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java index 0c5caaa4c..c9848b7f8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductPhotoKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class ProductPhotoKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java index 7a738109b..d2647d107 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReview.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(ProductReviewKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java index b328f68cf..87aaba5a0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductReviewCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java index 83035136a..1ae46347f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/ProductReviewKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class ProductReviewKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java index 849399456..bfdf97716 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSAToken.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java index b874d93fb..9f06b0d3b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/RSATokenCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface RSATokenCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java index 3b8d0bfa1..e7b2516fa 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployee.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.AstoriaDefaultService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java index 7e622545c..241501572 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v3/staticservice/microsoft/test/odata/services/astoriadefaultservice/types/SpecialEmployeeCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.*; -import org.apache.olingo.fit.proxy.v3.staticservice.microsoft.test.odata.services.astoriadefaultservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface SpecialEmployeeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java index 2c7f22cce..9485ef17e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java @@ -18,11 +18,14 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; +import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.ext.proxy.Service; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PersonCollection; +import org.junit.Test; import java.math.BigDecimal; import java.sql.Timestamp; @@ -30,16 +33,14 @@ import java.util.Arrays; import java.util.Calendar; import java.util.TimeZone; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; -import org.apache.olingo.ext.proxy.Service; -import static org.apache.olingo.fit.proxy.v4.AbstractTestITCase.container; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; /** * This is the unit test class to check entity create operations. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java index ad489ab3d..8e7c36aad 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.Arrays; -import java.util.Calendar; -import java.util.TimeZone; - import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.Service; @@ -40,6 +28,18 @@ import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Calendar; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + public abstract class AbstractTestITCase { /** diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java index 28c4987e6..4d097c1cb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java @@ -18,21 +18,23 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.olingo.ext.proxy.api.AsyncCall; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .CustomerCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.junit.Test; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.apache.commons.lang3.RandomStringUtils; -import org.apache.olingo.ext.proxy.api.AsyncCall; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; public class AsyncTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java index 76abd061d..e95ff2676 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java @@ -18,26 +18,30 @@ */ package org.apache.olingo.fit.proxy.v4; -import java.sql.Timestamp; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.Calendar; -import java.util.Collections; - -//CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PaymentInstrument; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey; -//CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductDetailCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductDetailKey; import org.junit.Test; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Collections; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +//CHECKSTYLE:OFF (Maven checkstyle) +//CHECKSTYLE:ON (Maven checkstyle) + public class BoundOperationInvokeTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java index 3f9a51072..9f67ccbeb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java @@ -18,24 +18,27 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .CreditCardPICollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .CustomerCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.junit.Test; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Calendar; import java.util.Collections; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; public class DerivedTypeTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java index 966eee783..0df5dd9d0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java @@ -18,22 +18,9 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.TimeZone; - import org.apache.commons.lang3.RandomUtils; import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.ext.proxy.Service; -//CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; @@ -44,14 +31,31 @@ import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.service import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PaymentInstrument; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PaymentInstrumentCollection; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection; -//CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductDetailCollection; import org.junit.Test; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + +//CHECKSTYLE:OFF (Maven checkstyle) +//CHECKSTYLE:ON (Maven checkstyle) + /** * This is the unit test class to check entity create operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java index 7ebed37af..3b9c41d65 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java @@ -18,38 +18,43 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .CustomerCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .EmployeeCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PaymentInstrument; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PersonCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; +import org.junit.Test; import java.lang.reflect.Proxy; import java.sql.Timestamp; import java.util.Calendar; import java.util.TimeZone; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; /** * This is the unit test class to check entity retrieve operations. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java index 37c2d0ca2..3bb30c3ab 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + /** * This is the unit test class to check basic feed operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java index cb7ed463f..b320172d0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java @@ -18,9 +18,22 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import org.apache.commons.lang3.RandomUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.client.api.v4.EdmEnabledODataClient; +import org.apache.olingo.ext.proxy.Service; +import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PaymentInstrument; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.junit.Test; import java.lang.reflect.Proxy; import java.math.BigDecimal; @@ -29,23 +42,12 @@ import java.util.Calendar; import java.util.Collections; import java.util.UUID; -import org.apache.commons.lang3.RandomUtils; -import org.apache.commons.lang3.StringUtils; -import org.apache.olingo.client.api.v4.EdmEnabledODataClient; -import org.apache.olingo.ext.proxy.Service; -import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; /** * This is the unit test class to check entity update operations. diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java index ca66587ca..c09de7916 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java @@ -18,22 +18,24 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertEquals; +import org.apache.olingo.ext.proxy.api.Search; +import org.apache.olingo.ext.proxy.api.Sort; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.People; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PersonCollection; +import org.junit.Test; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.olingo.ext.proxy.api.Search; -import org.apache.olingo.ext.proxy.api.Sort; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.People; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + //CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; //CHECKSTYLE:ON (Maven checkstyle) -import org.junit.Test; public class FilterTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java index c1c5da4e0..ae89ca68e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.Service; @@ -28,6 +25,9 @@ import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.service import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class KeyAsSegmentTestITCase extends AbstractTestITCase { private Service ecf; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java index cdfe5ff9c..51f92fbb7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.io.InputStream; -import java.sql.Timestamp; -import java.util.Calendar; -import java.util.UUID; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.olingo.client.api.v4.EdmEnabledODataClient; @@ -37,6 +27,16 @@ import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService; import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement; import org.junit.Test; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * This is the unit test class to check media entity retrieve operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java index 6c3bdec6d..417271838 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; -import static org.junit.Assert.assertTrue; - -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.UUID; - import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.Service; @@ -43,6 +31,18 @@ import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.ope import org.junit.BeforeClass; import org.junit.Test; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * This is the unit test class to check actions overloading. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java index c75acd24c..4574dc8bd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java @@ -18,21 +18,23 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.Collection; - -//CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection; -//CHECKSTYLE:ON (Maven checkstyle) +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductCollection; import org.junit.Test; +import java.util.Arrays; +import java.util.Collection; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +//CHECKSTYLE:OFF (Maven checkstyle) +//CHECKSTYLE:ON (Maven checkstyle) + public class OperationImportInvokeTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java index b15f9855a..7908fc55e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI; import org.junit.Test; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + /** * This is the unit test class to check actions overloading. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java index 2388ff5ec..219c390fd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.fit.proxy.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import org.apache.olingo.ext.proxy.api.Annotatable; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company; import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory; @@ -29,6 +25,10 @@ import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.service import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class SingletonTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java index 74718d444..98e736a6d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java index e7aa12054..3cd6d32a8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java index 0241270f4..28fae0789 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java @@ -19,30 +19,8 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.PersistenceManager; import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.PersistenceManager; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DemoService", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java index 0aae1ef40..edcbe0f1c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java index f611174b1..05294e4ad 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java index b8bca01cd..2a63ef68d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java index 1abbd0b17..b0c20a063 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java index d9712f1c8..9b9c691a5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java index 1f4b5bd70..be4a1ee5b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java @@ -19,27 +19,7 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java index 5a70f3951..7b0a8eaee 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java index 3e600c113..8f00c0d8c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AdvertisementCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java index 3c7dba358..c5a385940 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java index 3abe568ed..52a0e6d9b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CategoryCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java index 5b3e9ef39..2d16b6ec7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java index aa9236571..bdbdd374e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CustomerCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java index 3689100e8..3d8a9d8d0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java index 82b42908a..93cd0624d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EmployeeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java index 875a9c223..b61544540 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java index ac0a17439..2b375786f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface FeaturedProductCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java index 92750d6a0..777cd123e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java index 0b9566816..86b71e315 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PersonCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java index 779a5f33a..35ace9de7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java index 52aa39046..b9bbf51cd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PersonDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java index 674c6a364..5ef8d8215 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java index 18fb60ea1..2f6f1f24e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java index fd58f0e29..b76a4f3a7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java index 454a79c4a..3d2107894 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java index 19c503872..b9f84d703 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("ODataDemo") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java index 0c6541748..8bd8afb5a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.*; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface SupplierCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java index 5842df9cb..828dbfe57 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java @@ -19,30 +19,7 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.PersistenceManager; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "DefaultContainer", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java index 6494a5641..15c50ec13 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java index 7c7c64ff7..290ae6626 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java index 456f018db..7f1ae44e7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java @@ -19,27 +19,8 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java index 535c552f0..23a624ab7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java @@ -19,8 +19,6 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EnumType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java index e1eea4931..c7d24d1c5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java @@ -19,27 +19,7 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java index 1eb96a7ea..4d548f6c1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java index 33cf62ddc..240c9d577 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface IndexedRowCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java index 1d5eaee24..1453643e7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java index 6e42f78c2..4a3b5d466 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface RowCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java index 7057c48e6..da0814775 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.OpenTypesServiceV4") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java index c689aad44..d05ee6bd7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.*; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface RowIndexCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java index 117faf33b..d5133ddab 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java index 6e8c63831..a5e5a85fd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Boss.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractSingleton; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Singleton; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java index 065e3bb0a..d0407030f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Company.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractSingleton; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Singleton; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java index 868aa77fc..516afb5d4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java index 2c2eb29b3..fdaa72aab 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/DefaultStoredPI.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractSingleton; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Singleton; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java index 515ba96a3..ee5199dc4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java index 9068a3325..f980ce7ed 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java index 1ae8e0de2..9571702d8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java @@ -19,30 +19,8 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.PersistenceManager; import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.PersistenceManager; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "InMemoryEntities", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java index 8df2f6840..d7d6478d6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/LabourUnion.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractSingleton; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Singleton; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java index 616ee08e7..9e848b143 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java @@ -20,27 +20,7 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java index 12c556fac..396ec918b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java index 596a53be6..ba80b9be1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java index 25c2291f6..7df656c12 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductDetailKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java index f16173a4b..47f4777dc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java @@ -20,27 +20,8 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductReviewKey; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java index e7376dc9c..368d617c0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java index e046bfae4..cf5a5eff6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/PublicCompany.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractSingleton; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Singleton; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java index d5a4569fd..00dae0f65 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java index ad374fe7f..ac9877f0c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java index 446d959ed..111f10a6f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/VipCustomer.java @@ -20,27 +20,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; import org.apache.olingo.ext.proxy.api.AbstractSingleton; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Singleton; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java index f03c8d220..d85542d17 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java @@ -19,8 +19,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EnumType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java index 6a2ee3b09..b394607d3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java @@ -19,34 +19,12 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java index 0f9aefea0..68afdd5b4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AccountCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java index 5a6b3cdb0..888bd6bad 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java @@ -19,27 +19,8 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java index de9c2c750..ac518367b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java @@ -19,27 +19,7 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java index ae8cb1398..7e5fc81c6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java index 899a868c3..81b80831b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface AssetCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java index 560426416..1acb2943e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java index 326c0698b..94ae2ef3e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ClubCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java index 84c3835b9..cd3da1d2f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java @@ -19,8 +19,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EnumType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java index f3002ec3f..38ed5d8e3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java @@ -19,34 +19,12 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.AbstractOpenType; import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java index ced33f103..82f4cdd98 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java @@ -19,27 +19,7 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java index 8845b9252..cc4953d93 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java @@ -19,8 +19,6 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EnumType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java index 89a83c1ba..267effc59 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CompanyCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java index 40302556d..ef6d85bd7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java index e3ab4d608..467bd4ada 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CreditCardPICollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java index d93e38758..1d63dc1a8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java index 3061573a9..e130c0868 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CreditRecordCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java index fca2c8643..7f4fa208d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java index 059f80910..a1cdc1abc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface CustomerCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java index 0187fe0f4..ca290cc6d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java index 83bd36d9a..c2392100a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface DepartmentCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java index 96f5380d0..0b08c9dfe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java index eb7244905..13cb305e7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface EmployeeCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java index bdfe9d4f7..688c063de 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java index ef0a281fe..51b3ebdd2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface GiftCardCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java index fcf7ec2c2..bf0a8c073 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java @@ -19,27 +19,7 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.ComplexType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; import org.apache.olingo.ext.proxy.api.Annotatable; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java index c186d4ba6..9deae504f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java @@ -19,11 +19,7 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.Term; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") @org.apache.olingo.ext.proxy.api.annotations.Term(name = "IsBoss", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java index 07968e0ad..1e69be788 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java index 06ea15350..ad064d872 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface LabourUnionCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java index 02b55b5da..d3c332bca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java index 16402af7f..c6088c9cf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface OrderCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java index 672c302fa..e3df3cd00 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(OrderDetailKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java index 3d710d250..cae6894df 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface OrderDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java index 9090cf277..eee7393f0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class OrderDetailKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java index 62cda3514..8bbd06e76 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java index b7d33c34a..d8b2ddcf4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PaymentInstrumentCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java index 8cf25b764..e64db92a8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java index 4d5e5db26..7a908f201 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PersonCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java index ec265a16b..578153921 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; +import org.apache.olingo.ext.proxy.api.annotations.Key; +import org.apache.olingo.ext.proxy.api.annotations.Parameter; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java index 59b1d4835..7ee5f9e43 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java @@ -19,30 +19,13 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Operation; import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java index 130d0e2cb..94ff72ec7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(ProductDetailKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java index d0a5cd921..e7c038109 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductDetailCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java index 44def1baf..063f0a306 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class ProductDetailKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java index 215f559d4..81a62ffc9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java @@ -19,34 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; +import org.apache.olingo.client.api.edm.ConcurrencyMode; +import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.ext.proxy.api.annotations.Key; import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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; @KeyRef(ProductReviewKey.class) @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java index e21e969dc..4f1657a7e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface ProductReviewCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java index 6b1fed35c..31f1ff4fd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java @@ -19,33 +19,8 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKey; -import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; import org.apache.olingo.ext.proxy.api.AbstractEntityKey; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; -import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; -import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; +import org.apache.olingo.ext.proxy.api.annotations.CompoundKeyElement; @org.apache.olingo.ext.proxy.api.annotations.CompoundKey public class ProductReviewKey extends AbstractEntityKey { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java index 0052eded1..01967e39f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java @@ -19,34 +19,11 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.ext.proxy.api.AbstractOpenType; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java index 33b1eec7e..bf94f14a4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface PublicCompanyCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java index 9c3fcb346..d9a399267 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java index f5fb2c609..745aad8f9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface StatementCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java index 3963c7370..201ab2cb8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java index f29195b37..ff5fc932c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface StoredPICollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java index fa759156f..2c44c8bd0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java @@ -19,34 +19,9 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty; -import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Namespace; -import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.ext.proxy.api.annotations.EntitySet; -import org.apache.olingo.ext.proxy.api.annotations.Key; -import org.apache.olingo.ext.proxy.api.annotations.KeyRef; -import org.apache.olingo.ext.proxy.api.annotations.NavigationProperty; -import org.apache.olingo.ext.proxy.api.annotations.Property; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.ext.proxy.api.AbstractOpenType; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.client.api.edm.ConcurrencyMode; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; - -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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.api.edm.constants.EdmContentKind; +import org.apache.olingo.ext.proxy.api.annotations.Key; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java index 3c6a85184..5582a9890 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java @@ -19,30 +19,10 @@ package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; -import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.ext.proxy.api.AbstractEntityCollection; import org.apache.olingo.ext.proxy.api.AbstractTerm; -import org.apache.olingo.ext.proxy.api.OperationType; -import org.apache.olingo.ext.proxy.api.annotations.Operation; -import org.apache.olingo.ext.proxy.api.annotations.Parameter; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.*; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.*; -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; -import org.apache.olingo.commons.api.edm.geo.MultiLineString; -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 java.math.BigDecimal; -import java.net.URI; -import java.util.UUID; -import java.io.Serializable; import java.util.Collection; -import java.util.Calendar; -import javax.xml.datatype.Duration; public interface SubscriptionCollection extends diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java index d4223a03d..552d878e5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.fit.tecsvc.client; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; @@ -35,6 +31,10 @@ import org.apache.olingo.fit.tecsvc.TecSvcConst; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class BasicITCase { private static final String SERVICE_URI = TecSvcConst.BASE_URI; diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java index 34ff4d43e..306f07ba5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/BasicHttpITCase.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.fit.tecsvc.http; -import static org.junit.Assert.assertEquals; - -import java.net.HttpURLConnection; -import java.net.URL; - import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.fit.tecsvc.TecSvcConst; import org.junit.Test; +import java.net.HttpURLConnection; +import java.net.URL; + +import static org.junit.Assert.assertEquals; + public class BasicHttpITCase { private static final String SERVICE_URI = TecSvcConst.BASE_URI + "/"; diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java index 90c501b5f..d067777fc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/http/PingITCase.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.fit.tecsvc.http; -import static org.junit.Assert.assertEquals; - -import java.net.HttpURLConnection; -import java.net.URL; - import org.apache.olingo.fit.tecsvc.TecSvcConst; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.net.HttpURLConnection; +import java.net.URL; + +import static org.junit.Assert.assertEquals; + public class PingITCase { private static final Logger LOG = LoggerFactory.getLogger(PingITCase.class); diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java index a26e4b6cd..9e92276b7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/AbstractTestITCase.java @@ -18,23 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; @@ -68,6 +51,23 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.fit.AbstractBaseTestITCase; import org.junit.BeforeClass; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public abstract class AbstractTestITCase extends AbstractBaseTestITCase { protected static final FullQualifiedName TEST_PRODUCT_TYPE = diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java index 7f607c34f..bf155aef5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/ActionOverloadingTestITCase.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.LinkedHashMap; -import java.util.Map; - 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.uri.v3.URIBuilder; @@ -34,6 +28,12 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.junit.Test; +import java.util.LinkedHashMap; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ActionOverloadingTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java index 254782aec..ae3267e1b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/AsyncTestITCase.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - -import java.io.InputStream; -import java.net.URI; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType; @@ -41,6 +32,15 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.junit.Test; +import java.io.InputStream; +import java.net.URI; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + public class AsyncTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java index ea381002c..53e38f082 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/BatchTestITCase.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.net.URI; -import java.util.Iterator; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - import org.apache.http.HttpResponse; import org.apache.olingo.client.api.ODataBatchConstants; import org.apache.olingo.client.api.communication.request.ODataPayloadManager; @@ -60,6 +49,17 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; +import java.net.URI; +import java.util.Iterator; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class BatchTestITCase extends AbstractTestITCase { private static final String PREFIX = "!!PREFIX!!"; diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java index 2faf5cd65..d07c658ba 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/CountTestITCase.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; import org.apache.olingo.client.api.uri.CommonURIBuilder; @@ -29,6 +25,10 @@ import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class CountTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java index afc395400..5116cf774 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityCreateTestITCase.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.net.URI; -import java.util.Collections; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.Set; - import org.apache.http.entity.ContentType; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; @@ -52,6 +41,17 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; +import java.util.Collections; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + /** * This is the unit test class to check create entity operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java index fc3008642..3455e3e97 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityRetrieveTestITCase.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.LinkedHashMap; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; @@ -46,6 +38,14 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.LinkedHashMap; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check entity retrieve operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java index ff0b5a80f..02e5a4302 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntitySetTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.net.URI; - import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; @@ -39,6 +32,13 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check basic feed operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java index 8768859fd..86ad277ab 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/EntityUpdateTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.net.URI; -import java.util.LinkedHashMap; - import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; @@ -37,6 +30,13 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; +import java.util.LinkedHashMap; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + /** * This is the unit test class to check entity update operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java index c394608c3..d7a8ae066 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/ErrorTestITCase.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.communication.ODataClientErrorException; @@ -45,6 +36,15 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.InputStream; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; + /** * This is the unit test class to check basic entity operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java index beb5b412f..ea405162c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/FilterFactoryTestITCase.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.uri.v3.FilterArgFactory; import org.apache.olingo.client.api.uri.v3.FilterFactory; @@ -28,6 +25,9 @@ import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class FilterFactoryTestITCase extends AbstractTestITCase { private FilterFactory getFilterFactory() { diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java index eaa3a47e8..22f303499 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/FilterTestITCase.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.client.api.uri.v3.URIBuilder; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class FilterTestITCase extends AbstractTestITCase { private void filterQueryTest(final String entity, final String filter, final int expected) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java index 2a1ad02f1..5f71038ee 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/InvokeTestITCase.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.net.URI; -import java.util.Collections; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; @@ -50,6 +38,18 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class InvokeTestITCase extends AbstractTestITCase { private void getWithNoParams(final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java index 763daef52..bf674bf52 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/KeyAsSegmentTestITCase.java @@ -18,20 +18,19 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.client.api.communication.request.cud.v3.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.uri.v3.URIBuilder; import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.format.ODataFormat; -import static org.apache.olingo.fit.v3.AbstractTestITCase.client; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + public class KeyAsSegmentTestITCase extends AbstractTestITCase { @BeforeClass diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java index fd42cdab7..a4496ce3c 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/LinkTestITCase.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.net.URI; -import java.util.Collections; -import java.util.List; - import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkCreateRequest; import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType; @@ -40,6 +30,16 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; +import java.net.URI; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check basic link operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java index 8628130b5..ce31672bc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/MediaEntityTestITCase.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.ByteArrayInputStream; -import java.io.InputStream; - import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest; @@ -43,6 +37,12 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class MediaEntityTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java index 7ee68a8d5..05fbd5495 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/MetadataTestITCase.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.commons.api.edm.Edm; import org.junit.Test; +import static org.junit.Assert.assertNotNull; + public class MetadataTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java index f9fa045a3..3942b0eb4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/OpenTypeTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Calendar; -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; @@ -39,6 +32,13 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.Calendar; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class OpenTypeTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java index 831b9e062..a8bf80c5f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/PrimitiveKeysTestITCase.java @@ -18,18 +18,18 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -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.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.math.BigDecimal; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class PrimitiveKeysTestITCase extends AbstractTestITCase { private void readEntity(final String entityType, final Object key, final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java index 36761a78b..8703b1d11 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyRetrieveTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.List; - 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; @@ -40,6 +33,13 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class PropertyRetrieveTestITCase extends AbstractTestITCase { private void diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java index ef985774c..308f95e0e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; - import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest; @@ -48,6 +41,13 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check basic entity operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java index d64c89f23..9ebe46b4f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/PropertyValueTestITCase.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.IOException; - 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; @@ -33,6 +28,11 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class PropertyValueTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java index 202af48c8..ff26e73e6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/QueryOptionsTestITCase.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.fit.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Collections; -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; @@ -38,6 +30,14 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check for query options. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java index f961f4f7c..0b4000181 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v3/ServiceDocumentTestITCase.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.fit.v3; -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.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; + +import static org.junit.Assert.assertEquals; + public class ServiceDocumentTestITCase extends AbstractTestITCase { private void retrieveServiceDocument(final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java index 22733680d..a40435bca 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.IOException; -import java.math.BigDecimal; -import java.net.URI; -import java.util.Calendar; -import java.util.TimeZone; - import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; @@ -47,6 +38,15 @@ import org.apache.olingo.commons.core.domain.v4.ODataEntityImpl; import org.apache.olingo.fit.AbstractBaseTestITCase; import org.junit.BeforeClass; +import java.io.IOException; +import java.math.BigDecimal; +import java.net.URI; +import java.util.Calendar; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public abstract class AbstractTestITCase extends AbstractBaseTestITCase { protected static final ODataClient client = ODataClientFactory.getV4(); diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java index 56c07a690..1d78c668b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.net.URI; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - 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.request.v4.AsyncRequestWrapper; @@ -43,6 +33,16 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; +import java.util.List; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class AsyncTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java index ca42f0493..47d909f5f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java @@ -15,10 +15,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; - -import java.net.URI; - import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.batch.BatchManager; import org.apache.olingo.client.api.communication.request.batch.ODataChangeset; @@ -39,6 +35,10 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; + +import static org.junit.Assert.assertEquals; + public class AuthBatchTestITCase extends AbstractTestITCase { private final static ContentType ACCEPT = ContentType.APPLICATION_OCTET_STREAM; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java index 6fdf4341c..1d8e69def 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java @@ -18,21 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.io.IOException; -import java.math.BigDecimal; -import java.net.URI; -import java.util.Calendar; -import java.util.Collection; -import java.util.HashMap; -import java.util.Iterator; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; - import org.apache.http.HttpResponse; import org.apache.olingo.client.api.ODataBatchConstants; import org.apache.olingo.client.api.communication.header.HeaderName; @@ -70,6 +55,21 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; +import java.math.BigDecimal; +import java.net.URI; +import java.util.Calendar; +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class BatchTestITCase extends AbstractTestITCase { private static final String PREFIX = "!!PREFIX!!"; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java index 122096ea5..53141e5c9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Calendar; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.Map; -import java.util.TimeZone; - import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.uri.v4.URIBuilder; @@ -48,6 +37,17 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.Calendar; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class BoundOperationInvokeTestITCase extends AbstractTestITCase { private void functions(final ODataFormat format) throws EdmPrimitiveTypeException { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java index ff69f435e..6a0dbf6f1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.math.BigDecimal; -import java.net.URI; -import java.util.Calendar; -import java.util.TimeZone; - import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; @@ -60,6 +50,16 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.core.domain.v4.ODataEntityImpl; import org.junit.Test; +import java.math.BigDecimal; +import java.net.URI; +import java.util.Calendar; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * 13.2 Interoperable OData Clients *
diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java index 836fa6eaa..577f7ccc2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.request.retrieve.v4.ODataDeltaRequest; import org.apache.olingo.commons.api.domain.v4.ODataDelta; @@ -30,6 +26,10 @@ import org.apache.olingo.commons.api.domain.v4.ODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class DeltaTestITCase extends AbstractTestITCase { private void parse(final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java index 98324d0a4..a35bc8597 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; - -import java.math.BigDecimal; -import java.util.Calendar; -import java.util.TimeZone; - import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; @@ -40,6 +34,12 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.math.BigDecimal; +import java.util.Calendar; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; + public class DerivedTypeTestITCase extends AbstractTestITCase { private void read(final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java index 167b68f47..67bb7d1e8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.net.URI; -import java.util.Calendar; - import org.apache.commons.lang3.RandomUtils; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; @@ -38,6 +32,12 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; +import java.util.Calendar; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class EntityCreateTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java index b999d63a6..9106f7958 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.net.URI; -import java.util.LinkedHashMap; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; @@ -49,6 +40,15 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; +import java.util.LinkedHashMap; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check entity retrieve operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java index 9de562e64..cb4f0c39d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.net.URI; - import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; @@ -40,6 +33,13 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check basic feed operations. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java index 9a5ce9915..8c875eb5e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.math.BigDecimal; -import java.net.URI; -import java.util.Calendar; -import java.util.TimeZone; -import java.util.UUID; - import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse; @@ -38,6 +29,15 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.math.BigDecimal; +import java.net.URI; +import java.util.Calendar; +import java.util.TimeZone; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class EntityUpdateTestITCase extends AbstractTestITCase { private void upsert(final UpdateType updateType, final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java index 1a742a2c3..8cdd2dbae 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java @@ -18,18 +18,18 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.net.URI; -import java.util.Map; - import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.domain.ODataErrorDetail; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class ErrorResponseTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java index 82956e446..c0474c054 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; - import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.uri.v4.FilterArgFactory; @@ -30,6 +28,8 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class FilterFactoryTestITCase extends AbstractTestITCase { private FilterFactory getFilterFactory() { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java index 172a5f94a..75e219ddd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.math.BigDecimal; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; @@ -43,6 +35,14 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.math.BigDecimal; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * The test cases in this class are inspired by client conformance criteria defined in the specs diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java index 27a15aff1..ddbc070ac 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; - -import java.net.URI; - import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; @@ -38,6 +32,12 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; + public class KeyAsSegmentTestITCase extends AbstractTestITCase { @BeforeClass diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java index 09eb26619..405cea49d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.util.Calendar; -import java.util.Collection; -import java.util.UUID; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.olingo.client.api.communication.header.HeaderName; @@ -55,6 +44,17 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.Calendar; +import java.util.Collection; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class MediaEntityTestITCase extends AbstractTestITCase { private void read(final ODataClient client, final ODataFormat format) throws IOException { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java index 793b21424..6417ecca3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -39,6 +34,11 @@ import org.apache.olingo.commons.api.edm.annotation.EdmRecord; import org.apache.olingo.commons.core.edm.primitivetype.EdmBoolean; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class MetadataTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java index 0eb054ff1..8595c3ff0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.net.URI; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; @@ -37,6 +33,11 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class OAuth2TestITCase extends AbstractTestITCase { private EdmEnabledODataClient _edmClient; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java index 7486b9a6d..c88341111 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Calendar; -import java.util.TimeZone; -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; @@ -40,6 +32,14 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.Calendar; +import java.util.TimeZone; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class OpenTypeTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java index 622639658..487a25fbe 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.Map; - import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent; import org.apache.olingo.commons.api.domain.ODataCollectionValue; @@ -40,6 +32,14 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class OperationImportInvokeTestITCase extends AbstractTestITCase { private void functionImports(final ODataFormat format) throws EdmPrimitiveTypeException { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java index 05fa6061d..c592250e7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.IOException; - import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest; import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest; import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest; @@ -41,6 +36,11 @@ import org.apache.olingo.commons.api.domain.v4.ODataValuable; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class PropertyTestITCase extends AbstractTestITCase { private void _enum(final ODataClient client, final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java index b9e8f7062..6a431a065 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.communication.ODataClientErrorException; import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest; @@ -36,6 +31,11 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.io.IOException; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class PropertyValueTestITCase extends AbstractTestITCase { @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java index 413fcdd9c..2e3d3eb9f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Collections; -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; @@ -39,6 +30,15 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * This is the unit test class to check for query options. */ diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java index 25fb633fa..557e9c94e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.fit.v4; -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.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; + +import static org.junit.Assert.assertEquals; + public class ServiceDocumentTestITCase extends AbstractTestITCase { private void retrieveServiceDocument(final ODataFormat format) { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java index e6059c464..efa9602aa 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.fit.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.net.URI; - import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; @@ -39,6 +32,13 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class SingletonTestITCase extends AbstractTestITCase { private void read(final ODataClient client, final ODataFormat format) throws EdmPrimitiveTypeException { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/Configuration.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/Configuration.java index e1bf90788..dc0f014b8 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/Configuration.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/Configuration.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.client.api; -import java.util.concurrent.ExecutorService; - import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.HttpUriRequestFactory; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; +import java.util.concurrent.ExecutorService; + /** * Configuration wrapper. */ diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/HeaderName.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/HeaderName.java index a99c5ef5f..ed768ec8e 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/HeaderName.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/HeaderName.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.api.communication.header; -import java.util.Arrays; -import java.util.List; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.util.Arrays; +import java.util.List; + /** * Major OData request/response header names. */ diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/ODataPreferences.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/ODataPreferences.java index b6bd5c50d..94ea8ceab 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/ODataPreferences.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/header/ODataPreferences.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.api.communication.header; -import java.util.Arrays; -import java.util.List; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.util.Arrays; +import java.util.List; + /** * Values of the Prefer header. */ diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java index 6bcb3b8ea..c5650425f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataBasicRequest.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.api.communication.request; -import java.util.concurrent.Future; - import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.commons.api.format.ODataFormat; +import java.util.concurrent.Future; + /** * Basic OData request. * diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataPayloadManager.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataPayloadManager.java index 478bb5936..5ac13f3aa 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataPayloadManager.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataPayloadManager.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.communication.request; +import org.apache.olingo.client.api.communication.response.ODataResponse; + import java.io.InputStream; import java.util.concurrent.Future; -import org.apache.olingo.client.api.communication.response.ODataResponse; /** * OData request payload management abstract class. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataRequest.java index e9a2c900d..6d91fdcd5 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataRequest.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.api.communication.request; +import org.apache.olingo.client.api.communication.header.HeaderName; +import org.apache.olingo.client.api.http.HttpMethod; + import java.io.InputStream; import java.net.URI; import java.util.Collection; -import org.apache.olingo.client.api.communication.header.HeaderName; -import org.apache.olingo.client.api.http.HttpMethod; /** * Abstract representation of an OData request. Get instance by using factories. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/ODataBatchResponseItem.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/ODataBatchResponseItem.java index 2c829e9e4..b42c9b4c6 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/ODataBatchResponseItem.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/ODataBatchResponseItem.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.communication.request.batch; -import java.util.Iterator; import org.apache.olingo.client.api.communication.response.ODataResponse; +import java.util.Iterator; + /** * Abstract representation of a response item about a batch request. */ 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 eac9a8a94..23c47d7f9 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 @@ -18,15 +18,16 @@ */ package org.apache.olingo.client.api.communication.request.cud; -import java.io.InputStream; -import java.io.Serializable; -import java.net.URI; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest; import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest; import org.apache.olingo.commons.api.domain.CommonODataEntity; -import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.domain.CommonODataProperty; +import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; + +import java.io.InputStream; +import java.io.Serializable; +import java.net.URI; /** * OData request factory class. diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/CUDRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/CUDRequestFactory.java index a7092e956..11ea0fd69 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/CUDRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v3/CUDRequestFactory.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.client.api.communication.request.cud.v3; -import java.net.URI; import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory; import org.apache.olingo.commons.api.domain.ODataLink; +import java.net.URI; + public interface CUDRequestFactory extends CommonCUDRequestFactory { /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v4/CUDRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v4/CUDRequestFactory.java index 2c6964941..14bf85a3f 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v4/CUDRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v4/CUDRequestFactory.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.api.communication.request.cud.v4; -import java.net.URI; import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; import org.apache.olingo.commons.api.domain.v4.ODataSingleton; +import java.net.URI; + public interface CUDRequestFactory extends CommonCUDRequestFactory { ODataEntityUpdateRequest getSingletonUpdateRequest( diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/EdmEnabledInvokeRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/EdmEnabledInvokeRequestFactory.java index 8429b51f2..06ad9d25a 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/EdmEnabledInvokeRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/EdmEnabledInvokeRequestFactory.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.client.api.communication.request.invoke; -import java.net.URI; -import java.util.Map; import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.net.URI; +import java.util.Map; + public interface EdmEnabledInvokeRequestFactory extends InvokeRequestFactory { /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java index e869ed6bf..1e38813e7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/invoke/InvokeRequestFactory.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.client.api.communication.request.invoke; -import java.io.Serializable; -import java.net.URI; -import java.util.Map; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; +import java.io.Serializable; +import java.net.URI; +import java.util.Map; + /** * OData request factory class. */ 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 696ff23c5..c4bac8574 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 @@ -18,13 +18,13 @@ */ 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.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; +import java.util.Map; + /** * 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 4f3251602..721f3e3d1 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 @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.communication.request.invoke; -import java.io.Serializable; import org.apache.olingo.commons.api.domain.ODataInvokeResult; +import java.io.Serializable; + /** * 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/CommonRetrieveRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java index 0c992987d..da8b972af 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/CommonRetrieveRequestFactory.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import java.io.Serializable; -import java.net.URI; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.domain.CommonODataProperty; +import java.io.Serializable; +import java.net.URI; + /** * OData request factory class. */ 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 69e85bf64..9ee48606e 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 @@ -19,7 +19,6 @@ package org.apache.olingo.client.api.communication.request.retrieve; import org.apache.olingo.commons.api.domain.CommonODataProperty; -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/XMLMetadataRequest.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java index 626d0f919..a791c72ab 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/XMLMetadataRequest.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.communication.request.retrieve; -import java.util.Map; - import org.apache.olingo.client.api.edm.xml.Schema; +import java.util.Map; + /** * This class implements an XML metadata request. */ diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/RetrieveRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/RetrieveRequestFactory.java index 5adc932b0..2acf0657e 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/RetrieveRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v3/RetrieveRequestFactory.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.api.communication.request.retrieve.v3; -import java.net.URI; import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; @@ -28,6 +27,8 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.apache.olingo.commons.api.domain.v3.ODataProperty; +import java.net.URI; + @SuppressWarnings("unchecked") public interface RetrieveRequestFactory extends CommonRetrieveRequestFactory { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/RetrieveRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/RetrieveRequestFactory.java index a705f8e3c..f658190bf 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/RetrieveRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/RetrieveRequestFactory.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.api.communication.request.retrieve.v4; -import java.net.URI; import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; @@ -29,6 +28,8 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.domain.v4.ODataProperty; import org.apache.olingo.commons.api.domain.v4.ODataSingleton; +import java.net.URI; + @SuppressWarnings("unchecked") public interface RetrieveRequestFactory extends CommonRetrieveRequestFactory { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/v4/AsyncRequestWrapper.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/v4/AsyncRequestWrapper.java index 4645ff71b..a5b2798c3 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/v4/AsyncRequestWrapper.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/v4/AsyncRequestWrapper.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.client.api.communication.request.v4; -import java.net.URI; import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper; +import java.net.URI; + public interface AsyncRequestWrapper { /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataBatchResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataBatchResponse.java index 658acbdc1..e1a958812 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataBatchResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataBatchResponse.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.communication.response; -import java.util.Iterator; import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem; +import java.util.Iterator; + /** * This class implements a response to a batch request. * diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataResponse.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataResponse.java index 1538ad3a1..5a8ee1c64 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataResponse.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataResponse.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.client.api.communication.response; -import java.io.InputStream; -import java.util.Collection; -import java.util.Map; import org.apache.http.HttpResponse; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; +import java.io.InputStream; +import java.util.Collection; +import java.util.Map; + /** * Abstract representation of an OData response. */ diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/v4/AsyncResponseWrapper.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/v4/AsyncResponseWrapper.java index 04d368818..8124804f4 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/v4/AsyncResponseWrapper.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/v4/AsyncResponseWrapper.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.client.api.communication.response.v4; -import java.net.URI; import org.apache.olingo.client.api.communication.response.ODataDeleteResponse; import org.apache.olingo.client.api.communication.response.ODataResponse; +import java.net.URI; + public interface AsyncResponseWrapper { /** 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 966214e20..ce191f1c5 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 @@ -18,15 +18,6 @@ */ package org.apache.olingo.client.api.domain; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.net.URI; -import java.util.Iterator; -import java.util.NoSuchElementException; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; @@ -40,6 +31,15 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URI; +import java.util.Iterator; +import java.util.NoSuchElementException; + /** * OData entity set iterator class. *
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java index 55ee38e64..94df0a410 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Annotations.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v3; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.CommonAnnotations; +import java.util.List; + public interface Annotations extends CommonAnnotations { List getTypeAnnotations(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java index 5c5320137..6942fa886 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/Association.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v3; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.Named; +import java.util.List; + public interface Association extends Named { ReferentialConstraint getReferentialConstraint(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java index a6b4b44b3..aa30f6b6e 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/AssociationSet.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v3; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.Named; +import java.util.List; + public interface AssociationSet extends Named { String getAssociation(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java index f5a76dcdb..7ca4b30d4 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v3/ReferentialConstraintRole.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v3; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.PropertyRef; +import java.util.List; + public interface ReferentialConstraintRole { String getRole(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java index 996cac887..4d8b6fcc0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v4; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.Named; +import java.util.List; + public interface Action extends Named, Annotatable { boolean isBound(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java index 171c41665..e2bdaa29c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v4; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.Named; +import java.util.List; + public interface BindingTarget extends Named, Annotatable { List getNavigationPropertyBindings(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/NavigationProperty.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/NavigationProperty.java index 0eaaba728..830ca51d3 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/NavigationProperty.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/NavigationProperty.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v4; +import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty; import org.apache.olingo.client.api.edm.xml.OnDelete; import java.util.List; -import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty; public interface NavigationProperty extends CommonNavigationProperty, Annotatable { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Term.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Term.java index 6ed5b9fc5..bd5a47f33 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Term.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Term.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.client.api.edm.xml.v4; -import java.util.List; import org.apache.olingo.client.api.edm.xml.Named; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.util.List; + public interface Term extends Named, Annotatable { List getAppliesTo(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/TypeDefinition.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/TypeDefinition.java index 20234c24d..a96e3886a 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/TypeDefinition.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/TypeDefinition.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.api.edm.xml.v4; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.Named; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.util.List; + public interface TypeDefinition extends Named, Annotatable { List getAnnotations(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Apply.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Apply.java index 7315ad947..df97505ec 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Apply.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Apply.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v4.annotation; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotatable; +import java.util.List; + public interface Apply extends DynamicAnnotationExpression, Annotatable { String getFunction(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Record.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Record.java index fe2cd8d74..3b2447f3c 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Record.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Record.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.edm.xml.v4.annotation; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotatable; +import java.util.List; + public interface Record extends DynamicAnnotationExpression, Annotatable { List getPropertyValues(); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpClientFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpClientFactory.java index b7711818f..e70beb432 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpClientFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpClientFactory.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.http; -import java.net.URI; import org.apache.http.client.HttpClient; +import java.net.URI; + /** * Interface used by ODataRequest implementations to instantiate HttpClient. */ diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpUriRequestFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpUriRequestFactory.java index 18b89bd31..43c3c0349 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpUriRequestFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/http/HttpUriRequestFactory.java @@ -18,9 +18,10 @@ */ package org.apache.olingo.client.api.http; -import java.net.URI; import org.apache.http.client.methods.HttpUriRequest; +import java.net.URI; + /** * Interface used by ODataRequest implementations to create the HttpUriRequest. */ diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java index 8d4149fa3..33e0e0fc6 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ClientODataDeserializer.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.client.api.serialization; -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.data.ResWrap; import org.apache.olingo.commons.api.serialization.ODataDeserializer; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; + public interface ClientODataDeserializer extends ODataDeserializer { XMLMetadata toMetadata(InputStream input); diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java index c678d2b35..93a5fffc0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/CommonODataReader.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.api.serialization; -import java.io.InputStream; -import java.util.Map; - import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.CommonODataEntity; @@ -32,6 +29,9 @@ import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; +import java.util.Map; + /** * OData reader. *
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java index 87114870e..442d0452b 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/ODataWriter.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.client.api.serialization; -import java.io.InputStream; -import java.util.Collection; - import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.InputStream; +import java.util.Collection; + /** * OData writer. *
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataBinder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataBinder.java index 99c91d6a3..b7b362fb7 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataBinder.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataBinder.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.client.api.serialization.v3; -import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; import org.apache.olingo.client.api.serialization.CommonODataBinder; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; +import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.apache.olingo.commons.api.domain.v3.ODataProperty; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataDeserializer.java index 22cb30581..c7346b1ca 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataDeserializer.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.client.api.serialization.v3; -import java.io.InputStream; - import org.apache.olingo.client.api.serialization.ClientODataDeserializer; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.data.v3.LinkCollection; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; + public interface ODataDeserializer extends ClientODataDeserializer { /** diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java index b618e0e0f..77215aecf 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v3/ODataReader.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.api.serialization.v3; -import java.io.InputStream; - import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; import org.apache.olingo.client.api.serialization.CommonODataReader; import org.apache.olingo.commons.api.domain.v3.ODataEntity; @@ -28,6 +26,8 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; + public interface ODataReader extends CommonODataReader { @Override diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataDeserializer.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataDeserializer.java index 9df40d97f..c8af4f497 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataDeserializer.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataDeserializer.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.client.api.serialization.v4; -import java.io.InputStream; - import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata; import org.apache.olingo.client.api.serialization.ClientODataDeserializer; import org.apache.olingo.commons.api.data.Delta; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; + public interface ODataDeserializer extends ClientODataDeserializer { @Override diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java index 993034c54..ae4659f18 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/serialization/v4/ODataReader.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.api.serialization.v4; -import java.io.InputStream; - import org.apache.olingo.client.api.serialization.CommonODataReader; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; @@ -27,6 +25,8 @@ import org.apache.olingo.commons.api.domain.v4.ODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; + public interface ODataReader extends CommonODataReader { @Override diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v3/FilterArgFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v3/FilterArgFactory.java index 1a283f0ef..3d0d59444 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v3/FilterArgFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v3/FilterArgFactory.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.uri.v3; -import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.CommonFilterArgFactory; +import org.apache.olingo.client.api.uri.FilterArg; public interface FilterArgFactory extends CommonFilterArgFactory { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterArgFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterArgFactory.java index 2222edd34..456507cf0 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterArgFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterArgFactory.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.uri.v4; -import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.CommonFilterArgFactory; +import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.URIFilter; public interface FilterArgFactory extends CommonFilterArgFactory { diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterFactory.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterFactory.java index 490f4bb17..c66b0c59d 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterFactory.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/FilterFactory.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.api.uri.v4; -import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.CommonFilterFactory; +import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.commons.api.edm.EdmEnumType; diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/URIBuilder.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/URIBuilder.java index 176168d3a..590cd5293 100644 --- a/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/URIBuilder.java +++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/uri/v4/URIBuilder.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.api.uri.v4; -import java.util.Map; import org.apache.commons.lang3.tuple.Pair; -import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.client.api.uri.CommonURIBuilder; import org.apache.olingo.client.api.uri.QueryOption; +import org.apache.olingo.commons.api.edm.EdmEnumType; + +import java.util.Map; public interface URIBuilder extends CommonURIBuilder { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/ConfigurationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/ConfigurationImpl.java index ca8884562..a6e4bf5e4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/ConfigurationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/ConfigurationImpl.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.client.core; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - import org.apache.olingo.client.api.Configuration; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.HttpUriRequestFactory; @@ -31,6 +26,11 @@ import org.apache.olingo.client.core.http.DefaultHttpUriRequestFactory; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; + public class ConfigurationImpl implements Configuration { private static final String DEFAULT_PUB_FORMAT = "pubFormat"; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataHeadersImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataHeadersImpl.java index 25f9981fb..36b9400a7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataHeadersImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/header/ODataHeadersImpl.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.core.communication.header; +import org.apache.olingo.client.api.communication.header.HeaderName; +import org.apache.olingo.client.api.communication.header.ODataHeaders; + import java.util.Collection; import java.util.Map; import java.util.TreeMap; -import org.apache.olingo.client.api.communication.header.HeaderName; -import org.apache.olingo.client.api.communication.header.ODataHeaders; public class ODataHeadersImpl implements ODataHeaders { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java index cb72202a7..6a58b769a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataBasicRequest.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.client.core.communication.request; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; @@ -35,6 +29,12 @@ import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.commons.api.format.ODataFormat; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; + /** * Basic request abstract implementation. * diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java index ee3f74f2c..52211c8d6 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataRequest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.client.core.communication.request; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.lang.reflect.Constructor; -import java.net.URI; -import java.util.Collection; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.Header; @@ -43,6 +36,13 @@ import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.commons.api.format.ODataFormat; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.lang.reflect.Constructor; +import java.net.URI; +import java.util.Collection; + /** * Abstract representation of an OData request. Get instance by using factories. * diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamManager.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamManager.java index ef48fcdb8..45fca6241 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamManager.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamManager.java @@ -18,6 +18,12 @@ */ package org.apache.olingo.client.core.communication.request; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpResponse; +import org.apache.olingo.client.api.communication.request.ODataPayloadManager; +import org.apache.olingo.client.api.communication.response.ODataResponse; +import org.apache.olingo.client.api.http.HttpClientException; + import java.io.IOException; import java.io.InputStream; import java.io.PipedInputStream; @@ -26,11 +32,6 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.commons.io.IOUtils; -import org.apache.http.HttpResponse; -import org.apache.olingo.client.api.communication.request.ODataPayloadManager; -import org.apache.olingo.client.api.communication.response.ODataResponse; -import org.apache.olingo.client.api.http.HttpClientException; /** * OData request payload management abstract class. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java index b3fac1b79..e68443fae 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractODataStreamer.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.client.core.communication.request; -import java.io.IOException; -import java.io.OutputStream; -import java.io.PipedOutputStream; import org.apache.olingo.client.api.communication.request.ODataStreamer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.io.OutputStream; +import java.io.PipedOutputStream; + /** * Streamer utility object. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java index 53963954a..2b0ac7434 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/AbstractRequest.java @@ -15,8 +15,6 @@ */ package org.apache.olingo.client.core.communication.request; -import java.io.IOException; - import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpUriRequest; @@ -31,6 +29,8 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; + public abstract class AbstractRequest { /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java index e5ec4327b..34caf15d2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractBatchManager.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.batch; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; import org.apache.http.HttpResponse; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest; @@ -30,6 +28,9 @@ import org.apache.olingo.client.api.communication.response.ODataBatchResponse; import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager; import org.apache.olingo.client.core.communication.request.Wrapper; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; + /** * Batch request payload management. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java index 428dbf59c..c7b02e752 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchRequest.java @@ -18,13 +18,8 @@ */ package org.apache.olingo.client.core.communication.request.batch; -import java.io.PipedOutputStream; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.UUID; -import org.apache.olingo.client.api.ODataBatchConstants; import org.apache.olingo.client.api.CommonODataClient; +import org.apache.olingo.client.api.ODataBatchConstants; import org.apache.olingo.client.api.communication.request.ODataPayloadManager; import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest; import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem; @@ -33,6 +28,12 @@ import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.streamed.AbstractODataStreamedRequest; import org.apache.olingo.commons.api.format.ContentType; +import java.io.PipedOutputStream; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + /** * This class implements a batch request. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchResponseItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchResponseItem.java index 0deaf4368..c45744a0c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchResponseItem.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/AbstractODataBatchResponseItem.java @@ -18,15 +18,16 @@ */ package org.apache.olingo.client.core.communication.request.batch; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem; import org.apache.olingo.client.api.communication.response.ODataResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + /** * Abstract representation of a response item about a batch request. */ 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 b0429ac14..9ded02c16 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 @@ -18,6 +18,18 @@ */ package org.apache.olingo.client.core.communication.request.batch; +import org.apache.commons.io.IOUtils; +import org.apache.commons.io.LineIterator; +import org.apache.commons.lang3.StringUtils; +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; +import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.format.ContentType; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -29,17 +41,6 @@ import java.util.Map; import java.util.TreeMap; import java.util.regex.Matcher; 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.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; -import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; -import org.apache.olingo.commons.api.format.ContentType; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Utility class for batch requests and responses. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java index c86fff4d1..9dc3fda95 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.batch; -import java.util.UUID; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.request.ODataBatchableRequest; import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest; @@ -27,6 +26,8 @@ import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.AbstractODataRequest; import org.apache.olingo.commons.api.format.ContentType; +import java.util.UUID; + /** * Changeset wrapper for the corresponding batch item. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetResponseItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetResponseItem.java index 0128894bc..279646ce0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetResponseItem.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataChangesetResponseItem.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.client.core.communication.request.batch; +import org.apache.olingo.client.api.ODataBatchConstants; +import org.apache.olingo.client.api.communication.response.ODataResponse; +import org.apache.olingo.client.core.communication.response.batch.ODataBatchErrorResponse; +import org.apache.olingo.client.core.communication.response.v4.AsyncResponseImpl; + import java.util.Collection; import java.util.Map; import java.util.NoSuchElementException; -import org.apache.olingo.client.api.ODataBatchConstants; -import org.apache.olingo.client.api.communication.response.ODataResponse; -import static org.apache.olingo.client.core.communication.request.batch.AbstractODataBatchResponseItem.LOG; -import org.apache.olingo.client.core.communication.response.batch.ODataBatchErrorResponse; -import org.apache.olingo.client.core.communication.response.v4.AsyncResponseImpl; /** * Changeset wrapper for the corresponding batch item. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java index b27f5b036..a3eef0f03 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/ODataSingleResponseItem.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.client.core.communication.request.batch; -import java.util.Collection; -import java.util.Map; -import java.util.NoSuchElementException; import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.client.core.communication.response.batch.ODataBatchErrorResponse; import org.apache.olingo.client.core.communication.response.v4.AsyncResponseImpl; +import java.util.Collection; +import java.util.Map; +import java.util.NoSuchElementException; + /** * Retrieve response wrapper for the corresponding batch item. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java index d68a83d20..a52018524 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/BatchRequestFactoryImpl.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.client.core.communication.request.batch.v3; -import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.communication.request.batch.v3.BatchRequestFactory; import org.apache.olingo.client.api.communication.request.batch.v3.ODataBatchRequest; +import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.communication.request.batch.AbstractBatchRequestFactory; public class BatchRequestFactoryImpl extends AbstractBatchRequestFactory diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java index 54950e7eb..493e2a0a1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v3/ODataBatchRequestImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.batch.v3; -import java.io.IOException; -import java.net.URI; -import java.util.Iterator; -import java.util.concurrent.TimeUnit; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -36,11 +32,14 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.communication.request.AbstractODataRequest; import org.apache.olingo.client.core.communication.request.batch.AbstractBatchManager; import org.apache.olingo.client.core.communication.request.batch.AbstractODataBatchRequest; -import org.apache.olingo.client.core.communication.request.batch.v3.ODataBatchRequestImpl.BatchManagerImpl; -import org.apache.olingo.client.core.communication.request.batch.v3.ODataBatchRequestImpl.ODataBatchResponseImpl; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; import org.apache.olingo.client.core.communication.response.batch.ODataBatchResponseManager; +import java.io.IOException; +import java.net.URI; +import java.util.Iterator; +import java.util.concurrent.TimeUnit; + /** * This class implements a batch request. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java index 159db1d1f..dc350ee4d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/BatchRequestFactoryImpl.java @@ -18,9 +18,9 @@ */ package org.apache.olingo.client.core.communication.request.batch.v4; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.api.communication.request.batch.v4.BatchRequestFactory; import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest; +import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.communication.request.batch.AbstractBatchRequestFactory; public class BatchRequestFactoryImpl extends AbstractBatchRequestFactory diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java index 52d5194ad..e7f38994e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/batch/v4/ODataBatchRequestImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.batch.v4; -import java.io.IOException; -import java.net.URI; -import java.util.Iterator; -import java.util.concurrent.TimeUnit; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -38,6 +34,11 @@ import org.apache.olingo.client.core.communication.request.batch.AbstractODataBa import org.apache.olingo.client.core.communication.response.AbstractODataResponse; import org.apache.olingo.client.core.communication.response.batch.ODataBatchResponseManager; +import java.io.IOException; +import java.net.URI; +import java.util.Iterator; +import java.util.concurrent.TimeUnit; + /** * This class implements a batch request. */ 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 1a7e5b153..a09c49c33 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud; -import java.io.InputStream; -import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory; import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType; @@ -40,6 +38,9 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; +import java.io.InputStream; +import java.net.URI; + public abstract class AbstractCUDRequestFactory implements CommonCUDRequestFactory { private static final long serialVersionUID = -2723641791198745990L; 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 c9b2594fb..066efb8f1 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 @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud; -import java.io.InputStream; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -31,6 +28,9 @@ import org.apache.olingo.client.core.communication.request.AbstractODataBasicReq import org.apache.olingo.client.core.communication.response.AbstractODataResponse; import org.apache.olingo.commons.api.format.ODataFormat; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an OData delete request. */ 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 de514bf60..d65def8cb 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 @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud; -import java.io.InputStream; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -39,6 +36,9 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an OData create request. * 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 55f8d87af..261fc37a0 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 @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud; -import java.io.InputStream; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -39,6 +36,9 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an OData update request. * 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 f65cb9485..df18e8fd2 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 @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud; -import java.io.InputStream; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -39,6 +36,9 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an OData update entity property request. */ 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 e1ec593cd..4566891e1 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 @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud; -import java.io.InputStream; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -37,6 +34,9 @@ import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.format.ODataFormat; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an OData update entity property value request. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java index 96d61ae07..3ade52998 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/CUDRequestFactoryImpl.java @@ -18,16 +18,17 @@ */ package org.apache.olingo.client.core.communication.request.cud.v3; -import java.net.URI; +import org.apache.olingo.client.api.communication.request.cud.v3.CUDRequestFactory; import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkCreateRequest; import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkUpdateRequest; -import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.communication.request.cud.v3.CUDRequestFactory; import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType; import org.apache.olingo.client.api.http.HttpMethod; +import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.communication.request.cud.AbstractCUDRequestFactory; import org.apache.olingo.commons.api.domain.ODataLink; +import java.net.URI; + public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory implements CUDRequestFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkCreateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkCreateRequestImpl.java index b3977fba7..9baf8bf8a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkCreateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkCreateRequestImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud.v3; -import java.io.InputStream; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -36,6 +33,9 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an insert link OData request. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkUpdateRequestImpl.java index 8d4464987..6bd4dd53d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v3/ODataLinkUpdateRequestImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.cud.v3; -import java.io.InputStream; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -36,6 +33,9 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an update link OData request. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java index db9813427..57473a1fc 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/cud/v4/CUDRequestFactoryImpl.java @@ -18,14 +18,15 @@ */ package org.apache.olingo.client.core.communication.request.cud.v4; -import java.net.URI; import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFactory; import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType; +import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.communication.request.cud.AbstractCUDRequestFactory; import org.apache.olingo.commons.api.domain.v4.ODataSingleton; +import java.net.URI; + public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory implements CUDRequestFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java index a9ed3f493..550522254 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractEdmEnabledInvokeRequestFactory.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.invoke; -import java.net.URI; -import java.util.ArrayList; -import java.util.Map; import org.apache.olingo.client.api.CommonEdmEnabledODataClient; import org.apache.olingo.client.api.communication.request.invoke.EdmEnabledInvokeRequestFactory; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; @@ -35,6 +32,10 @@ import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmSchema; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.net.URI; +import java.util.ArrayList; +import java.util.Map; + public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInvokeRequestFactory implements EdmEnabledInvokeRequestFactory { 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 536088e5c..1a46d0447 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.invoke; -import java.net.URI; -import java.util.Map; import org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent; @@ -32,6 +30,9 @@ import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import java.net.URI; +import java.util.Map; + public abstract class AbstractInvokeRequestFactory implements InvokeRequestFactory { private static final long serialVersionUID = -906760270085197249L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java index 27f40754a..379141934 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/AbstractODataInvokeRequest.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.invoke; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.util.LinkedHashMap; -import java.util.Map; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -49,6 +43,12 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.LinkedHashMap; +import java.util.Map; + /** * This class implements an OData invoke operation request. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java index b9eeeb1ad..16a629ef3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/EdmEnabledInvokeRequestFactoryImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.invoke.v3; -import java.net.URI; -import java.util.Map; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.v3.EdmEnabledODataClient; @@ -27,6 +25,9 @@ import org.apache.olingo.client.core.communication.request.invoke.AbstractEdmEna import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; +import java.net.URI; +import java.util.Map; + public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory { private static final long serialVersionUID = 5854571629835831697L; 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 e6ff223fd..c369c0449 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 @@ -18,14 +18,15 @@ */ package org.apache.olingo.client.core.communication.request.invoke.v3; -import java.net.URI; -import java.util.Map; -import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; +import org.apache.olingo.client.api.http.HttpMethod; +import org.apache.olingo.client.api.v3.ODataClient; +import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory; import org.apache.olingo.commons.api.domain.ODataInvokeResult; 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 java.net.URI; +import java.util.Map; public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java index bec962860..ffda7d075 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v3/ODataInvokeRequestImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.invoke.v3; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Map; - import org.apache.http.client.utils.URIBuilder; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.http.HttpMethod; @@ -31,6 +27,10 @@ import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.format.ODataFormat; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.Map; + public class ODataInvokeRequestImpl extends AbstractODataInvokeRequest { public ODataInvokeRequestImpl(final CommonODataClient odataClient, final Class reference, diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java index 2579108cd..46027f603 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/EdmEnabledInvokeRequestFactoryImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.invoke.v4; -import java.net.URI; -import java.util.Map; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.v4.EdmEnabledODataClient; @@ -27,6 +25,9 @@ import org.apache.olingo.client.core.communication.request.invoke.AbstractEdmEna import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; +import java.net.URI; +import java.util.Map; + public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory { private static final long serialVersionUID = 5854571629835831697L; 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 15035b5c9..de4e1dcd8 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 @@ -18,15 +18,16 @@ */ package org.apache.olingo.client.core.communication.request.invoke.v4; -import java.net.URI; -import java.util.Map; -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest; import org.apache.olingo.client.api.http.HttpMethod; +import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory; import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; +import java.net.URI; +import java.util.Map; + public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory { private static final long serialVersionUID = 8452737360003104372L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java index 1aa607bf0..c4fa7998a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/invoke/v4/ODataInvokeRequestImpl.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.invoke.v4; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URLEncoder; -import java.util.Map; - import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.core.communication.request.invoke.AbstractODataInvokeRequest; @@ -32,6 +27,11 @@ import org.apache.olingo.commons.api.domain.ODataInvokeResult; import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.format.ODataFormat; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URLEncoder; +import java.util.Map; + public class ODataInvokeRequestImpl extends AbstractODataInvokeRequest { private ODataFormat format; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java index 537e00ca1..c317ee754 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractMetadataRequestImpl.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataRequest; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; +import java.net.URI; + public abstract class AbstractMetadataRequestImpl extends AbstractODataRetrieveRequest { public AbstractMetadataRequestImpl(final CommonODataClient odataClient, final URI query) { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java index 9c4cf2e10..d557aacaf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.io.InputStream; -import java.net.URI; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -29,6 +27,9 @@ 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; +import java.io.InputStream; +import java.net.URI; + /** * This is an abstract representation of an OData retrieve query request returning one or more result item. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java index 8ac4dc185..46b2bb2f5 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractRetrieveRequestFactory.java @@ -18,17 +18,18 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; -import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest; +import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest; +import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceDocumentRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest; -import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory; import org.apache.olingo.client.core.uri.URIUtils; +import java.net.URI; + public abstract class AbstractRetrieveRequestFactory implements CommonRetrieveRequestFactory { private static final long serialVersionUID = -111683263158803362L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java index c902eacd4..783a79055 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java @@ -18,14 +18,15 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; -import java.util.Map; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest; import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse; import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.commons.api.edm.Edm; +import java.net.URI; +import java.util.Map; + /** * This class implements a metadata query request. */ 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 1b8526684..f5cb6d9b3 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -31,6 +29,8 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.net.URI; + /** * 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 de4c11dcc..e5391f2ae 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -30,6 +28,8 @@ import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; +import java.net.URI; + /** * 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 f39d113d1..bb83d9f9d 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -31,6 +29,8 @@ import org.apache.olingo.commons.api.domain.CommonODataEntitySet; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.net.URI; + /** * 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 c24f80a7b..4feae4f51 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 @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -31,6 +27,10 @@ import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.commons.api.format.ODataFormat; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; + /** * This class implements an OData media query request. */ 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 25a9ca6a4..2490cf989 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 @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.io.IOException; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -33,6 +30,9 @@ import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.IOException; +import java.net.URI; + /** * This class implements an OData entity property query request. */ 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 35cf07309..90679b84e 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 @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -35,6 +31,10 @@ import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.net.URI; + /** * This class implements a generic OData request. */ 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 21dabf9be..453ac281a 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -31,6 +29,8 @@ import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.net.URI; + /** * 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 f417e5d4c..34e157a6b 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -31,6 +29,8 @@ import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.format.ODataFormat; +import java.net.URI; + /** * This class implements an OData entity property value query request. */ 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 b7cb4643a..a48756a0d 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 @@ -18,20 +18,20 @@ */ package org.apache.olingo.client.core.communication.request.retrieve.v3; -import java.io.IOException; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; -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.http.HttpClientException; +import org.apache.olingo.client.api.v3.ODataClient; +import org.apache.olingo.client.core.communication.request.retrieve.AbstractODataRetrieveRequest; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.client.api.http.HttpClientException; -import org.apache.olingo.client.core.communication.request.retrieve.AbstractODataRetrieveRequest; + +import java.io.IOException; +import java.net.URI; /** * This class implements an OData link query request. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java index 359ddb807..25020fb55 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/RetrieveRequestFactoryImpl.java @@ -18,15 +18,14 @@ */ package org.apache.olingo.client.core.communication.request.retrieve.v3; -import java.net.URI; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; 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.request.retrieve.XMLMetadataRequest; -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.request.retrieve.v3.RetrieveRequestFactory; +import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.communication.request.retrieve.AbstractRetrieveRequestFactory; import org.apache.olingo.client.core.communication.request.retrieve.ODataEntityRequestImpl; import org.apache.olingo.client.core.communication.request.retrieve.ODataEntitySetIteratorRequestImpl; @@ -36,6 +35,8 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.apache.olingo.commons.api.domain.v3.ODataProperty; +import java.net.URI; + @SuppressWarnings("unchecked") public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory implements RetrieveRequestFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java index 2b0cd1817..c669326a3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve.v3; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -34,6 +30,10 @@ import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.communication.request.retrieve.AbstractMetadataRequestImpl; import org.apache.olingo.commons.api.format.ODataFormat; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl> implements XMLMetadataRequest { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/ODataDeltaRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/ODataDeltaRequestImpl.java index dbcfd4a71..c719c6b25 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/ODataDeltaRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/ODataDeltaRequestImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve.v4; -import java.io.IOException; -import java.net.URI; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -35,6 +32,9 @@ import org.apache.olingo.commons.api.domain.v4.ODataDelta; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.IOException; +import java.net.URI; + public class ODataDeltaRequestImpl extends AbstractODataRetrieveRequest implements ODataDeltaRequest { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java index e2433dca0..f3a173559 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/RetrieveRequestFactoryImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve.v4; -import java.net.URI; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest; import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest; @@ -37,6 +36,8 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.api.domain.v4.ODataProperty; import org.apache.olingo.commons.api.domain.v4.ODataSingleton; +import java.net.URI; + @SuppressWarnings("unchecked") public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory implements RetrieveRequestFactory { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java index e489c99f7..746204fad 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.retrieve.v4; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -41,6 +37,10 @@ import org.apache.olingo.client.core.edm.xml.v4.AnnotationsImpl; import org.apache.olingo.client.core.edm.xml.v4.SchemaImpl; import org.apache.olingo.commons.api.format.ODataFormat; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; + public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl> implements XMLMetadataRequest { 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 506270a9c..07366aa3f 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.streamed; -import java.net.URI; - import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.communication.request.ODataPayloadManager; import org.apache.olingo.client.api.communication.request.streamed.ODataStreamedEntityRequest; @@ -27,6 +25,8 @@ import org.apache.olingo.client.api.communication.response.ODataResponse; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.commons.api.format.ODataFormat; +import java.net.URI; + /** * Abstract class representing a request concerning a streamed entity. * 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 d55c27843..c076b9d61 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 @@ -18,12 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.streamed; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.apache.http.HttpResponse; @@ -42,6 +36,12 @@ import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.concurrent.Callable; +import java.util.concurrent.Future; + /** * Streamed OData request abstract class. * 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 6cca1a8d6..18314c621 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 @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.streamed; -import java.io.InputStream; -import java.net.URI; -import java.util.concurrent.TimeUnit; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -36,6 +32,10 @@ import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; +import java.net.URI; +import java.util.concurrent.TimeUnit; + /** * This class implements an OData Media Entity create request. Get instance by using ODataStreamedRequestFactory. * 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 2290d68a0..2ae6541f2 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 @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.streamed; -import java.io.InputStream; -import java.net.URI; -import java.util.concurrent.TimeUnit; - import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -36,6 +32,10 @@ import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.CommonODataEntity; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; +import java.net.URI; +import java.util.concurrent.TimeUnit; + /** * This class implements an OData Media Entity create request. Get instance by using ODataStreamedRequestFactory. * diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java index c9dcf5e84..3e79ec81b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/streamed/ODataStreamUpdateRequestImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.streamed; -import java.io.InputStream; -import java.net.URI; -import java.util.concurrent.TimeUnit; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -31,6 +28,10 @@ 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; +import java.io.InputStream; +import java.net.URI; +import java.util.concurrent.TimeUnit; + /** * This class implements an OData stream create/update request. Get instance by using ODataStreamedRequestFactory. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java index e1fe1023f..f50f77534 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncBatchRequestWrapperImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.v4; -import java.net.URI; -import java.util.Collection; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.communication.header.HeaderName; import org.apache.olingo.client.api.communication.header.ODataPreferences; @@ -33,6 +31,9 @@ import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapp import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.net.URI; +import java.util.Collection; + public class AsyncBatchRequestWrapperImpl extends AsyncRequestWrapperImpl implements AsyncBatchRequestWrapper { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java index 98866986c..3a7c08a91 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/v4/AsyncRequestWrapperImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.communication.request.v4; -import java.io.IOException; -import java.net.URI; -import java.util.logging.Level; -import java.util.logging.Logger; import org.apache.commons.lang3.ArrayUtils; import org.apache.http.Header; import org.apache.http.HttpResponse; @@ -45,6 +41,11 @@ import org.apache.olingo.client.core.communication.request.AbstractODataRequest; import org.apache.olingo.client.core.communication.request.AbstractRequest; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; +import java.net.URI; +import java.util.logging.Level; +import java.util.logging.Logger; + public class AsyncRequestWrapperImpl extends AbstractRequest implements AsyncRequestWrapper { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java index 8cb148198..9558d5dda 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/AbstractODataResponse.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.client.core.communication.response; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.PipedInputStream; -import java.io.PipedOutputStream; -import java.util.Collection; -import java.util.HashSet; -import java.util.Map; -import java.util.TreeMap; import org.apache.commons.io.IOUtils; import org.apache.http.Header; import org.apache.http.HttpResponse; @@ -46,6 +36,17 @@ import org.apache.olingo.commons.api.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.PipedInputStream; +import java.io.PipedOutputStream; +import java.util.Collection; +import java.util.HashSet; +import java.util.Map; +import java.util.TreeMap; + /** * Abstract representation of an OData response. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchErrorResponse.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchErrorResponse.java index 6305aad57..2a907bb2a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchErrorResponse.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/batch/ODataBatchErrorResponse.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.client.core.communication.response.batch; -import java.util.Collection; -import java.util.Map; import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator; import org.apache.olingo.client.core.communication.request.batch.ODataBatchController; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; +import java.util.Collection; +import java.util.Map; + public class ODataBatchErrorResponse extends AbstractODataResponse { public ODataBatchErrorResponse( 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 5f522478e..f29f37b7d 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 @@ -18,14 +18,7 @@ */ package org.apache.olingo.client.core.communication.response.batch; -import java.io.IOException; -import java.util.Collection; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.NoSuchElementException; import org.apache.commons.io.IOUtils; -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; @@ -33,9 +26,17 @@ import org.apache.olingo.client.api.communication.response.ODataBatchResponse; import org.apache.olingo.client.core.communication.request.batch.ODataBatchLineIteratorImpl; import org.apache.olingo.client.core.communication.request.batch.ODataBatchUtilities; import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem; +import org.apache.olingo.commons.api.Constants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.IOException; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.NoSuchElementException; + /** * Batch response manager class. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/v4/AsyncResponseImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/v4/AsyncResponseImpl.java index 642c5af8e..6342dc2cf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/v4/AsyncResponseImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/response/v4/AsyncResponseImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.communication.response.v4; -import java.util.Collection; -import java.util.Map; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.olingo.client.api.CommonODataClient; @@ -28,6 +26,9 @@ import org.apache.olingo.client.api.communication.response.v4.AsyncResponse; import org.apache.olingo.client.core.communication.request.batch.ODataBatchController; import org.apache.olingo.client.core.communication.response.AbstractODataResponse; +import java.util.Collection; +import java.util.Map; + /** * Abstract representation of an OData response. */ 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 fc9b27edd..df8678c0d 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 @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.core.data; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.util.Iterator; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.commons.api.Constants; @@ -31,11 +31,10 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.core.serialization.JsonDeserializer; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.util.Iterator; public class JSONServiceDocumentDeserializer extends JsonDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java index ec10e9d9b..bb7c48977 100755 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/ServiceDocumentImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.data; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -30,6 +26,10 @@ import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.ServiceDocumentItem; import org.apache.olingo.commons.api.Constants; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public class ServiceDocumentImpl implements ServiceDocument { private String title; 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 ee67b5eeb..13e23d0dc 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,10 +18,10 @@ */ package org.apache.olingo.client.core.data; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonToken; +import com.fasterxml.jackson.dataformat.xml.XmlFactory; +import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser; import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.core.uri.URIUtils; import org.apache.olingo.commons.api.data.ResWrap; @@ -29,10 +29,9 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.core.serialization.JsonDeserializer; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonToken; -import com.fasterxml.jackson.dataformat.xml.XmlFactory; -import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; public class XMLServiceDocumentDeserializer extends JsonDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/AbstractEdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/AbstractEdmServiceMetadataImpl.java index d598d786f..12d67b464 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/AbstractEdmServiceMetadataImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/AbstractEdmServiceMetadataImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -36,6 +32,10 @@ import org.apache.olingo.commons.api.edm.EdmServiceMetadata; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.edm.EdmEntitySetInfoImpl; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + public abstract class AbstractEdmServiceMetadataImpl implements EdmServiceMetadata { protected final List xmlSchemas; 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 686de4493..6c936cc88 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 @@ -18,9 +18,7 @@ */ package org.apache.olingo.client.core.edm; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.ActionImport; -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; @@ -29,6 +27,9 @@ import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; + +import java.util.List; public class EdmActionImportImpl extends EdmOperationImportImpl implements EdmActionImport { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java index d158419ec..1d4bbab04 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationHelperImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotatable; import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.commons.api.edm.Edm; @@ -27,6 +25,9 @@ import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; +import java.util.ArrayList; +import java.util.List; + public class EdmAnnotationHelperImpl implements EdmAnnotationHelper { private final Edm edm; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java index e69b794d3..a9f6aeeee 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationImpl.java @@ -18,15 +18,12 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotatable; import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; import org.apache.olingo.client.api.edm.xml.v4.annotation.DynamicAnnotationExpression; import org.apache.olingo.client.api.edm.xml.v4.annotation.PropertyValue; import org.apache.olingo.client.core.edm.v4.annotation.EdmCastImpl; -import org.apache.olingo.commons.core.edm.annotation.EdmAnnotationPathImpl; import org.apache.olingo.client.core.edm.v4.annotation.EdmConstantAnnotationExpressionImpl; import org.apache.olingo.client.core.edm.v4.annotation.EdmIsOfImpl; import org.apache.olingo.client.core.edm.v4.annotation.EdmRecordImpl; @@ -40,6 +37,7 @@ import org.apache.olingo.commons.api.edm.annotation.EdmDynamicAnnotationExpressi import org.apache.olingo.commons.api.edm.annotation.EdmPropertyValue; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.annotation.EdmAndImpl; +import org.apache.olingo.commons.core.edm.annotation.EdmAnnotationPathImpl; import org.apache.olingo.commons.core.edm.annotation.EdmApplyImpl; import org.apache.olingo.commons.core.edm.annotation.EdmCollectionImpl; import org.apache.olingo.commons.core.edm.annotation.EdmEqImpl; @@ -60,6 +58,9 @@ import org.apache.olingo.commons.core.edm.annotation.EdmPropertyPathImpl; import org.apache.olingo.commons.core.edm.annotation.EdmPropertyValueImpl; import org.apache.olingo.commons.core.edm.annotation.EdmUrlRefImpl; +import java.util.ArrayList; +import java.util.List; + public class EdmAnnotationImpl implements EdmAnnotation { private final Edm edm; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java index b4888b669..55785f587 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmAnnotationsImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.Annotations; @@ -34,6 +32,9 @@ import org.apache.olingo.commons.api.edm.EdmStructuredType; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.ArrayList; +import java.util.List; + public class EdmAnnotationsImpl implements EdmAnnotations { private final Edm edm; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java index ed26215fd..268eb460a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmBindingTargetImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.BindingTarget; import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; import org.apache.olingo.commons.api.edm.Edm; @@ -33,6 +30,9 @@ import org.apache.olingo.commons.core.edm.AbstractEdmBindingTarget; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmNavigationPropertyBindingImpl; +import java.util.ArrayList; +import java.util.List; + public abstract class EdmBindingTargetImpl extends AbstractEdmBindingTarget { private final BindingTarget target; 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 3fb155d94..968f59af3 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,14 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; @@ -65,6 +57,15 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.edm.AbstractEdm; import org.apache.olingo.commons.core.edm.EdmTypeInfo; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + public class EdmClientImpl extends AbstractEdm { private final ODataServiceVersion version; 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 970e1e3f4..25b417dbe 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,9 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.List; -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.client.api.edm.xml.Schema; import org.apache.olingo.commons.api.edm.Edm; @@ -32,6 +29,10 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.AbstractEdmComplexType; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; + +import java.util.List; +import java.util.Map; public class EdmComplexTypeImpl extends AbstractEdmComplexType { 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 799e439ca..50c879091 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,11 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.Collections; -import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import java.util.List; - -import org.apache.olingo.client.api.v3.UnsupportedInV3Exception; 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; @@ -30,6 +25,7 @@ import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; import org.apache.olingo.client.api.edm.xml.v4.ActionImport; import org.apache.olingo.client.api.edm.xml.v4.Singleton; +import org.apache.olingo.client.api.v3.UnsupportedInV3Exception; import org.apache.olingo.client.core.edm.v3.EdmActionImportProxy; import org.apache.olingo.client.core.edm.v3.EdmEntitySetProxy; import org.apache.olingo.client.core.edm.v3.EdmFunctionImportProxy; @@ -44,6 +40,10 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.AbstractEdmEntityContainer; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; + +import java.util.Collections; +import java.util.List; public class EdmEntityContainerImpl extends AbstractEdmEntityContainer { 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 54af86fec..b32b460e7 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,11 +18,6 @@ */ 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; - import org.apache.olingo.client.api.edm.xml.EntityType; import org.apache.olingo.client.api.edm.xml.PropertyRef; import org.apache.olingo.client.api.edm.xml.Schema; @@ -37,6 +32,11 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.AbstractEdmEntityType; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; public class EdmEntityTypeImpl extends AbstractEdmEntityType { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java index cc29e0604..79bb2abef 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmEnumTypeImpl.java @@ -18,25 +18,26 @@ */ package org.apache.olingo.client.core.edm; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.olingo.client.api.edm.xml.EnumType; +import org.apache.olingo.client.api.edm.xml.Member; +import org.apache.olingo.commons.api.edm.Edm; +import org.apache.olingo.commons.api.edm.EdmEnumType; +import org.apache.olingo.commons.api.edm.EdmException; +import org.apache.olingo.commons.api.edm.EdmMember; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.core.edm.AbstractEdmEnumType; +import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; + import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.client.api.edm.xml.EnumType; -import org.apache.olingo.client.api.edm.xml.Member; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmMember; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.apache.olingo.commons.core.edm.AbstractEdmEnumType; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; public class EdmEnumTypeImpl extends AbstractEdmEnumType implements EdmEnumType { 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 7317199de..f0aa29b00 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,9 +18,6 @@ */ 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; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -30,6 +27,9 @@ import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; + +import java.util.List; public class EdmFunctionImportImpl extends EdmOperationImportImpl implements EdmFunctionImport { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java index 389e67b02..906e98e89 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmMemberImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.Collections; -import java.util.List; import org.apache.olingo.client.api.edm.xml.Member; import org.apache.olingo.client.core.edm.xml.v4.MemberImpl; import org.apache.olingo.commons.api.edm.Edm; @@ -29,6 +27,9 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.AbstractEdmMember; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; +import java.util.Collections; +import java.util.List; + public class EdmMemberImpl extends AbstractEdmMember { private EdmAnnotationHelper helper; 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 6aa3476f8..b53e8e26a 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,9 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint; import org.apache.olingo.commons.api.edm.Edm; @@ -32,6 +29,9 @@ import org.apache.olingo.commons.core.edm.AbstractEdmNavigationProperty; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; +import java.util.ArrayList; +import java.util.List; + public class EdmNavigationPropertyImpl extends AbstractEdmNavigationProperty { private final FullQualifiedName structuredTypeName; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java index 9e8b3bca2..afd8047aa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImpl.java @@ -18,10 +18,7 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.lang3.StringUtils; - import org.apache.olingo.client.api.edm.xml.CommonParameter; import org.apache.olingo.client.api.edm.xml.v4.Action; import org.apache.olingo.commons.api.edm.Edm; @@ -33,6 +30,9 @@ import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.core.edm.AbstractEdmOperation; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; +import java.util.ArrayList; +import java.util.List; + public abstract class EdmOperationImpl extends AbstractEdmOperation { protected final Action operation; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImportImpl.java index c3ec0d2cd..beac8c240 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmOperationImportImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.Collections; -import java.util.List; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -27,6 +25,9 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.Target; import org.apache.olingo.commons.core.edm.AbstractEdmOperationImport; +import java.util.Collections; +import java.util.List; + public abstract class EdmOperationImportImpl extends AbstractEdmOperationImport { protected EdmOperationImportImpl(final Edm edm, final EdmEntityContainer container, final String name, 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 6cef92d60..ec7f116fe 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,8 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.Collections; -import java.util.List; import org.apache.olingo.client.api.edm.xml.CommonParameter; import org.apache.olingo.client.api.edm.xml.v4.Parameter; import org.apache.olingo.commons.api.edm.Edm; @@ -32,6 +30,9 @@ import org.apache.olingo.commons.core.edm.AbstractEdmParameter; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; +import java.util.Collections; +import java.util.List; + public class EdmParameterImpl extends AbstractEdmParameter { private final CommonParameter parameter; 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 66544972a..fbdf82be0 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,8 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.Collections; -import java.util.List; import org.apache.olingo.client.api.edm.xml.CommonProperty; import org.apache.olingo.client.api.edm.xml.v4.Property; import org.apache.olingo.commons.api.edm.Edm; @@ -33,6 +31,9 @@ import org.apache.olingo.commons.core.edm.AbstractEdmProperty; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.EdmTypeInfo; +import java.util.Collections; +import java.util.List; + public class EdmPropertyImpl extends AbstractEdmProperty implements EdmProperty { private final FullQualifiedName structuredTypeName; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java index 5d179af4d..18b0e3b5c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmReferentialConstraintImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -26,6 +25,8 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.core.edm.AbstractEdmReferentialConstraint; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; +import java.util.List; + public class EdmReferentialConstraintImpl extends AbstractEdmReferentialConstraint { private final EdmAnnotationHelper helper; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java index 27c0ccf73..42bfc7d86 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmSchemaImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.olingo.client.api.edm.xml.ComplexType; import org.apache.olingo.client.api.edm.xml.EntityContainer; import org.apache.olingo.client.api.edm.xml.EntityType; @@ -52,6 +48,11 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.edm.AbstractEdmSchema; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class EdmSchemaImpl extends AbstractEdmSchema { private final ODataServiceVersion version; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java index c0b0cabb0..41c319dc3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - 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; @@ -34,6 +30,10 @@ import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper { private final Edm edm; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java index 8bf4be0ef..08054e556 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTermImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.ArrayList; -import java.util.List; import org.apache.commons.lang3.ClassUtils; import org.apache.olingo.client.api.edm.xml.v4.Term; import org.apache.olingo.commons.api.edm.Edm; @@ -36,6 +34,9 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + public class EdmTermImpl extends EdmNamedImpl implements EdmTerm { private static final Logger LOG = LoggerFactory.getLogger(EdmTermImpl.class); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java index 8e0e05cc4..8dbcf0f94 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmTypeDefinitionImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.edm; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -34,6 +33,8 @@ import org.apache.olingo.commons.core.edm.AbstractEdmTypeDefinition; import org.apache.olingo.commons.core.edm.EdmAnnotationHelper; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; +import java.util.List; + public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition implements EdmTypeDefinition { private final TypeDefinition typeDefinition; 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 cb22d1162..cecd486f7 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,12 +20,12 @@ 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.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; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.apache.olingo.commons.core.edm.EdmTypeInfo; public class EdmActionImportProxy extends EdmOperationImportImpl implements EdmActionImport { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmEntitySetProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmEntitySetProxy.java index be15323a0..32aa47c71 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmEntitySetProxy.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmEntitySetProxy.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.edm.v3; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import org.apache.olingo.client.api.edm.xml.EntityContainer; import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.api.edm.xml.v3.Association; @@ -39,6 +35,11 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.AbstractEdmBindingTarget; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class EdmEntitySetProxy extends AbstractEdmBindingTarget implements EdmEntitySet { private final List xmlSchemas; 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 da6605d53..f5458859e 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 @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.edm.v3; -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.commons.api.edm.Edm; @@ -28,6 +26,8 @@ import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class EdmFunctionImportProxy extends EdmOperationImportImpl implements EdmFunctionImport { private final FunctionImport functionImport; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java index ac16e67e3..e4e3c5875 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmNavigationPropertyProxy.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.edm.v3; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.api.edm.xml.v3.Association; import org.apache.olingo.client.api.edm.xml.v3.AssociationEnd; @@ -38,6 +35,10 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.AbstractEdmNavigationProperty; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class EdmNavigationPropertyProxy extends AbstractEdmNavigationProperty { private final List xmlSchemas; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java index 477fc0d3c..896e90f0d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmOperationProxy.java @@ -18,16 +18,12 @@ */ package org.apache.olingo.client.core.edm.v3; -import org.apache.olingo.client.core.edm.xml.v3.ReturnTypeProxy; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.CommonParameter; import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; import org.apache.olingo.client.api.edm.xml.v3.Parameter; import org.apache.olingo.client.core.edm.EdmParameterImpl; import org.apache.olingo.client.core.edm.EdmReturnTypeImpl; +import org.apache.olingo.client.core.edm.xml.v3.ReturnTypeProxy; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmParameter; @@ -36,6 +32,10 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.core.edm.AbstractEdmOperation; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class EdmOperationProxy extends AbstractEdmOperation { protected final FunctionImport functionImport; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmServiceMetadataImpl.java index 01b4a8790..8e4623123 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmServiceMetadataImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v3/EdmServiceMetadataImpl.java @@ -18,14 +18,11 @@ */ package org.apache.olingo.client.core.edm.v3; -import java.util.ArrayList; -import java.util.List; - -import org.apache.olingo.client.api.v3.UnsupportedInV3Exception; 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.Schema; import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; +import org.apache.olingo.client.api.v3.UnsupportedInV3Exception; import org.apache.olingo.client.core.edm.AbstractEdmServiceMetadataImpl; import org.apache.olingo.commons.api.edm.EdmActionImportInfo; import org.apache.olingo.commons.api.edm.EdmFunctionImportInfo; @@ -34,6 +31,9 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.edm.EdmActionImportInfoImpl; import org.apache.olingo.commons.core.edm.EdmFunctionImportInfoImpl; +import java.util.ArrayList; +import java.util.List; + public class EdmServiceMetadataImpl extends AbstractEdmServiceMetadataImpl { private static final ODataServiceVersion SERVICE_VERSION = ODataServiceVersion.V30; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java index 798716c19..efe720280 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/EdmServiceMetadataImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.edm.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.CommonFunctionImport; import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.api.edm.xml.v4.ActionImport; @@ -35,6 +32,9 @@ import org.apache.olingo.commons.core.edm.EdmActionImportInfoImpl; import org.apache.olingo.commons.core.edm.EdmFunctionImportInfoImpl; import org.apache.olingo.commons.core.edm.EdmSingletonInfoImpl; +import java.util.ArrayList; +import java.util.List; + public class EdmServiceMetadataImpl extends AbstractEdmServiceMetadataImpl { private static final ODataServiceVersion SERVICE_VERSION = ODataServiceVersion.V40; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmConstantAnnotationExpressionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmConstantAnnotationExpressionImpl.java index e0ce3ba8c..a80735f17 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmConstantAnnotationExpressionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmConstantAnnotationExpressionImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.edm.v4.annotation; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.edm.xml.v4.annotation.ConstantAnnotationExpression; import org.apache.olingo.commons.api.Constants; @@ -37,6 +34,9 @@ import org.apache.olingo.commons.core.domain.v4.ODataEnumValueImpl; import org.apache.olingo.commons.core.domain.v4.ODataPrimitiveValueImpl; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; +import java.util.ArrayList; +import java.util.List; + public class EdmConstantAnnotationExpressionImpl implements EdmConstantAnnotationExpression { private final ODataValue value; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java index e01f7b039..69685d5a4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/v4/annotation/EdmRecordImpl.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.edm.v4.annotation; -import java.util.List; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmStructuredType; import org.apache.olingo.commons.api.edm.annotation.EdmPropertyValue; @@ -26,6 +25,8 @@ import org.apache.olingo.commons.api.edm.annotation.EdmRecord; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.annotation.AbstractEdmAnnotatableDynamicAnnotationExpression; +import java.util.List; + public class EdmRecordImpl extends AbstractEdmAnnotatableDynamicAnnotationExpression implements EdmRecord { private final Edm edm; 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 e09250c31..b02d8ca8d 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 @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; 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; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java index df505d06f..26f16121a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractDataServices.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.DataServices; @JsonDeserialize(using = DataServicesDeserializer.class) 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 edfda03b9..407837263 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 @@ -23,13 +23,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonDeserializer; import com.fasterxml.jackson.dataformat.xml.deser.FromXmlParser; - -import java.io.IOException; - import org.apache.olingo.client.core.edm.xml.v4.ReturnTypeImpl; import org.apache.olingo.client.core.edm.xml.v4.annotation.ConstantAnnotationExpressionImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; + public abstract class AbstractEdmDeserializer extends JsonDeserializer { protected ODataServiceVersion version; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java index 656ba5650..d817d464b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmItem.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.client.core.edm.xml; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - 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.edm.xml.Named; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public abstract class AbstractEdmItem { protected T getOneByName(final String name, final Collection items) { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java index 15b6e8c99..a15a16549 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractEdmx.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.DataServices; import org.apache.olingo.client.api.edm.xml.Edmx; 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 fb6b22995..980558fad 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 @@ -19,13 +19,12 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -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 java.util.List; + @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 d2762adad..a436e2ed6 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 @@ -19,7 +19,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; @JsonDeserialize(using = EntitySetDeserializer.class) 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 649dbe8c7..d228dd6c6 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 @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; 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; 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 d84bfbd32..e30790298 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 @@ -19,13 +19,12 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.EnumType; +import org.apache.olingo.client.api.edm.xml.Member; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.EnumType; -import org.apache.olingo.client.api.edm.xml.Member; - @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/AbstractMember.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java index b16ee7d40..9e94439fe 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractMember.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.Member; public abstract class AbstractMember extends AbstractEdmItem implements Member { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java index 74882ccf9..c65dbc7f1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractNavigationProperty.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty; public class AbstractNavigationProperty extends AbstractEdmItem implements CommonNavigationProperty { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java index 6733fdc18..9de4834dc 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractParameter.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.CommonParameter; @JsonDeserialize(using = ParameterDeserializer.class) diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java index b4e88ebdd..b04e22099 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractProperty.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.CommonProperty; import org.apache.olingo.commons.api.edm.geo.SRID; 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 83ac0ac3b..ad3f10a2e 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 @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - 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; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java index 729a38dc7..f8c5eb035 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/AbstractXMLMetadata.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.client.core.edm.xml; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.edm.xml.Edmx; import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.api.edm.xml.XMLMetadata; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + /** * Entry point for access information about EDM metadata. */ 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 97d7d0b59..aa31e04ec 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 @@ -22,13 +22,12 @@ 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.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; + public class ComplexTypeDeserializer extends AbstractEdmDeserializer { @Override 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 c94c0494f..75595d591 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,12 +18,11 @@ */ package org.apache.olingo.client.core.edm.xml; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; - 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 org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import java.io.IOException; 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 1e3de6f19..1e701175a 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 @@ -18,13 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml; -import org.apache.olingo.client.core.edm.xml.v4.ReferenceImpl; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; - 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 org.apache.olingo.client.core.edm.xml.v4.ReferenceImpl; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import java.io.IOException; 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 591406004..fb7f2ec59 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 @@ -22,9 +22,6 @@ 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.core.edm.xml.v3.AssociationSetImpl; import org.apache.olingo.client.core.edm.xml.v4.ActionImportImpl; @@ -32,6 +29,8 @@ import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.client.core.edm.xml.v4.SingletonImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; + @SuppressWarnings("rawtypes") public class EntityContainerDeserializer extends AbstractEdmDeserializer { 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 b47e0fcb1..b198ca8b1 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 @@ -19,13 +19,12 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.EntityKey; +import org.apache.olingo.client.api.edm.xml.PropertyRef; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.EntityKey; -import org.apache.olingo.client.api.edm.xml.PropertyRef; - @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/EntitySetDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EntitySetDeserializer.java index 5f913d4fe..cb7859c80 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 @@ -22,14 +22,13 @@ 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.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.client.core.edm.xml.v4.NavigationPropertyBindingImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; + public class EntitySetDeserializer extends AbstractEdmDeserializer { @Override 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 3b9b28de0..9091eb87b 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 @@ -22,13 +22,12 @@ 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.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; + public class EntityTypeDeserializer extends AbstractEdmDeserializer { @Override 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 954533f98..95926be5e 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 @@ -22,13 +22,12 @@ 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.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; + public class EnumTypeDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java index cc72645bd..f53823de0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/OnDeleteImpl.java @@ -18,11 +18,10 @@ */ package org.apache.olingo.client.core.edm.xml; +import com.fasterxml.jackson.annotation.JsonProperty; import org.apache.olingo.client.api.edm.xml.OnDelete; import org.apache.olingo.client.api.edm.xml.OnDeleteAction; -import com.fasterxml.jackson.annotation.JsonProperty; - public class OnDeleteImpl extends AbstractEdmItem implements OnDelete { private static final long serialVersionUID = -5321523424474336347L; 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 4980def5b..b1a7f1249 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 @@ -22,15 +22,14 @@ 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.xml.v3.ParameterMode; import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.io.IOException; + public class ParameterDeserializer extends AbstractEdmDeserializer { @Override 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 7a40fad94..dda940d1f 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,21 +18,20 @@ */ package org.apache.olingo.client.core.edm.xml; -import java.io.IOException; - +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 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.commons.api.edm.constants.EdmContentKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; - -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 org.apache.olingo.commons.api.edm.geo.SRID; +import java.io.IOException; + public class PropertyDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java index 6cc813bc6..21aaa5b34 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/PropertyRefImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.PropertyRef; public class PropertyRefImpl extends AbstractEdmItem implements PropertyRef { 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 0728b01c8..6b521ec6b 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 @@ -22,9 +22,6 @@ 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.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; @@ -35,6 +32,8 @@ import org.apache.olingo.client.core.edm.xml.v4.TermImpl; import org.apache.olingo.client.core.edm.xml.v4.TypeDefinitionImpl; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.io.IOException; + @SuppressWarnings("rawtypes") public class SchemaDeserializer extends AbstractEdmDeserializer { 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 a8a88eb90..39eb0f602 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class AnnotationsDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java index e9d92588b..886e5231c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AnnotationsImpl.java @@ -19,15 +19,14 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v3.Annotations; import org.apache.olingo.client.api.edm.xml.v3.TypeAnnotation; import org.apache.olingo.client.api.edm.xml.v3.ValueAnnotation; import org.apache.olingo.client.core.edm.xml.AbstractAnnotations; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = AnnotationsDeserializer.class) public class AnnotationsImpl extends AbstractAnnotations implements Annotations { 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 51dc42aff..56ac9af1e 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class AssociationDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java index e5942da92..de46ca9aa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationEndImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.OnDelete; import org.apache.olingo.client.api.edm.xml.v3.AssociationEnd; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java index af7b5b562..fbf94c987 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationImpl.java @@ -19,15 +19,14 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v3.Association; import org.apache.olingo.client.api.edm.xml.v3.AssociationEnd; import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraint; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = AssociationDeserializer.class) public class AssociationImpl extends AbstractEdmItem implements Association { 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 f7268c278..17914c31a 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class AssociationSetDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java index f39beb0ba..11068838e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetEndImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v3.AssociationSetEnd; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java index d49aa4415..2b6d386ae 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/AssociationSetImpl.java @@ -19,14 +19,13 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v3.AssociationSet; import org.apache.olingo.client.api.edm.xml.v3.AssociationSetEnd; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = AssociationSetDeserializer.class) public class AssociationSetImpl extends AbstractEdmItem implements AssociationSet { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java index 6f4c8370b..736dd9cf0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ComplexTypeImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml.v3; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.ComplexType; import org.apache.olingo.client.core.edm.xml.AbstractComplexType; +import java.util.ArrayList; +import java.util.List; + public class ComplexTypeImpl extends AbstractComplexType implements ComplexType { private static final long serialVersionUID = -1251230308269425962L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java index 542c20df9..758400c1e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/DataServicesImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml.v3; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.core.edm.xml.AbstractDataServices; +import java.util.ArrayList; +import java.util.List; + public class DataServicesImpl extends AbstractDataServices { private static final long serialVersionUID = 633129618050875211L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java index 1866a5798..1b788eea4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityContainerImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.client.core.edm.xml.v3; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.EntitySet; import org.apache.olingo.client.api.edm.xml.v3.AssociationSet; import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; import org.apache.olingo.client.core.edm.xml.AbstractEntityContainer; +import java.util.ArrayList; +import java.util.List; + public class EntityContainerImpl extends AbstractEntityContainer { private static final long serialVersionUID = 8934431875078180370L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java index d20e9810b..f692161ae 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EntityTypeImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.client.core.edm.xml.v3; +import org.apache.olingo.client.core.edm.xml.AbstractEntityType; + import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.core.edm.xml.AbstractEntityType; - public class EntityTypeImpl extends AbstractEntityType { private static final long serialVersionUID = 8727765036150269547L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java index 942a2b889..69017b78c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/EnumTypeImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml.v3; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.Member; import org.apache.olingo.client.core.edm.xml.AbstractEnumType; +import java.util.ArrayList; +import java.util.List; + public class EnumTypeImpl extends AbstractEnumType { private static final long serialVersionUID = 8967396195669128419L; 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 3b7c4c7ef..d28a7ebda 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 @@ -22,12 +22,11 @@ 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.core.edm.xml.AbstractEdmDeserializer; +import java.io.IOException; + public class FunctionImportDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java index 7a00c3a37..6526afa27 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/FunctionImportImpl.java @@ -19,13 +19,12 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; +import org.apache.olingo.client.api.edm.xml.v3.Parameter; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; -import org.apache.olingo.client.api.edm.xml.v3.Parameter; - @JsonDeserialize(using = FunctionImportDeserializer.class) public class FunctionImportImpl implements FunctionImport { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java index 2c7aa9026..ec35c1718 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/NavigationPropertyImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v3.NavigationProperty; import org.apache.olingo.client.core.edm.xml.AbstractNavigationProperty; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java index 17c536997..fc4ff006a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/PropertyValueImpl.java @@ -19,14 +19,13 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.olingo.client.api.edm.xml.v3.PropertyValue; +import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import org.apache.olingo.client.api.edm.xml.v3.PropertyValue; -import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; - public class PropertyValueImpl extends AbstractEdmItem implements PropertyValue { private static final long serialVersionUID = -6580934436491418564L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java index b60f581bd..055c34a66 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintImpl.java @@ -20,7 +20,6 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraint; import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraintRole; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; 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 4bd4e1a4c..8648f4483 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.PropertyRefImpl; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.PropertyRefImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class ReferentialConstraintRoleDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java index 4f2ddd5e8..531118a01 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ReferentialConstraintRoleImpl.java @@ -19,14 +19,13 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.PropertyRef; import org.apache.olingo.client.api.edm.xml.v3.ReferentialConstraintRole; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = ReferentialConstraintRoleDeserializer.class) public class ReferentialConstraintRoleImpl extends AbstractEdmItem implements ReferentialConstraintRole { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java index e8a5650b1..3ca202aa1 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/SchemaImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.edm.xml.v3; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.ComplexType; import org.apache.olingo.client.api.edm.xml.EntityContainer; import org.apache.olingo.client.api.edm.xml.EntityType; @@ -32,6 +29,9 @@ import org.apache.olingo.client.api.edm.xml.v3.Using; import org.apache.olingo.client.api.edm.xml.v3.ValueTerm; import org.apache.olingo.client.core.edm.xml.AbstractSchema; +import java.util.ArrayList; +import java.util.List; + public class SchemaImpl extends AbstractSchema implements Schema { private static final long serialVersionUID = 4453992249818796144L; 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 fd2aac38c..418005d58 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class TypeAnnotationDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java index fe713d4bd..e8bca6e15 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/TypeAnnotationImpl.java @@ -19,14 +19,13 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v3.PropertyValue; import org.apache.olingo.client.api.edm.xml.v3.TypeAnnotation; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = TypeAnnotationDeserializer.class) public class TypeAnnotationImpl extends AbstractEdmItem implements TypeAnnotation { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java index e701682fd..27ec2697d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/UsingImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v3.Using; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java index b55270f61..c5c41df1f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueAnnotationImpl.java @@ -19,14 +19,13 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.olingo.client.api.edm.xml.v3.ValueAnnotation; +import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; import java.math.BigDecimal; import java.math.BigInteger; import java.util.Date; -import org.apache.olingo.client.api.edm.xml.v3.ValueAnnotation; -import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; - public class ValueAnnotationImpl extends AbstractEdmItem implements ValueAnnotation { private static final long serialVersionUID = -1826414005417952278L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java index 9b2e663f3..74859e38d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v3/ValueTermImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v3; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v3.ValueTerm; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; 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 41399a9d4..494d4fc10 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 @@ -22,12 +22,11 @@ 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.core.edm.xml.AbstractEdmDeserializer; +import java.io.IOException; + public class ActionDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java index a09eea679..28a2f5e2d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImpl.java @@ -19,14 +19,13 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Action; import org.apache.olingo.client.api.edm.xml.v4.Parameter; import org.apache.olingo.client.api.edm.xml.v4.ReturnType; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = ActionDeserializer.class) public class ActionImpl extends AbstractAnnotatable implements Action { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java index 5a06389c1..fe127d224 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ActionImportImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v4.ActionImport; public class ActionImportImpl extends AbstractAnnotatable implements ActionImport { 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 d9d9e0c5c..3d26a8fbc 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.annotation.AbstractDynamicAnnotationExpression; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.annotation.AbstractDynamicAnnotationExpression; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class AnnotationDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java index c75aa7a2d..f19c71587 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; 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 5ab7afb25..b1aa277ff 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class AnnotationsDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java index 110b21fec..353062c3b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/AnnotationsImpl.java @@ -19,13 +19,13 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.Annotations; import org.apache.olingo.client.core.edm.xml.AbstractAnnotations; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = AnnotationsDeserializer.class) public class AnnotationsImpl extends AbstractAnnotations implements Annotations { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java index 8a165842c..b0dbc4aa3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ComplexTypeImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.ComplexType; import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; import org.apache.olingo.client.api.edm.xml.v4.Property; import org.apache.olingo.client.core.edm.xml.AbstractComplexType; +import java.util.ArrayList; +import java.util.List; + public class ComplexTypeImpl extends AbstractComplexType implements ComplexType { private static final long serialVersionUID = -1251230308269425962L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java index bf4ed66b6..b30d96ef9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/DataServicesImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Schema; import org.apache.olingo.client.core.edm.xml.AbstractDataServices; +import java.util.ArrayList; +import java.util.List; + public class DataServicesImpl extends AbstractDataServices { private static final long serialVersionUID = -7954360771258897632L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java index d1bbd0749..c8be4d766 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EdmxImpl.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Edmx; import org.apache.olingo.client.api.edm.xml.v4.Reference; import org.apache.olingo.client.core.edm.xml.AbstractEdmx; +import java.util.ArrayList; +import java.util.List; + public class EdmxImpl extends AbstractEdmx implements Edmx { private static final long serialVersionUID = -8031883176876401375L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java index b79e0eb52..0d0910c00 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntitySetImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.EntitySet; import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; import org.apache.olingo.client.core.edm.xml.AbstractEntitySet; +import java.util.ArrayList; +import java.util.List; + public class EntitySetImpl extends AbstractEntitySet implements EntitySet { private static final long serialVersionUID = 5570833733884884012L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java index cbe2eea21..25addefaf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EntityTypeImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.EntityType; import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; import org.apache.olingo.client.api.edm.xml.v4.Property; import org.apache.olingo.client.core.edm.xml.AbstractEntityType; +import java.util.ArrayList; +import java.util.List; + public class EntityTypeImpl extends AbstractEntityType implements EntityType { private static final long serialVersionUID = 8727765036150269547L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java index 44a3b895e..41adfacf0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/EnumTypeImpl.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotatable; import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.core.edm.xml.AbstractEnumType; +import java.util.ArrayList; +import java.util.List; + public class EnumTypeImpl extends AbstractEnumType implements Annotatable { private static final long serialVersionUID = -3329664331877556957L; 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 200060f5a..4c69713cc 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 @@ -22,12 +22,11 @@ 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.core.edm.xml.AbstractEdmDeserializer; +import java.io.IOException; + public class FunctionDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java index 7041bff8b..8658e1eaf 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.v4.Function; @JsonDeserialize(using = FunctionDeserializer.class) diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java index 0c4fc0eb8..227d0ca24 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportDeserializer.java @@ -22,12 +22,11 @@ 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.core.edm.xml.AbstractEdmDeserializer; +import java.io.IOException; + public class FunctionImportDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java index 33e806751..14ec3af41 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/FunctionImportImpl.java @@ -19,12 +19,12 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.FunctionImport; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = FunctionImportDeserializer.class) public class FunctionImportImpl implements FunctionImport { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java index 23d311a30..6b4e4c417 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeAnnotationsImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java index ea9bc01da..64b9bd417 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/IncludeImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v4.Include; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java index 980dbf91e..05e71939e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyBindingImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; 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 8d1e2e262..c9d6f5f0e 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 @@ -18,18 +18,16 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import org.apache.olingo.client.core.edm.xml.OnDeleteImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - 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 org.apache.commons.lang3.BooleanUtils; +import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.OnDeleteImpl; import java.io.IOException; -import org.apache.commons.lang3.BooleanUtils; - public class NavigationPropertyDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java index 87c260daf..af21dd697 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/NavigationPropertyImpl.java @@ -19,16 +19,15 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.OnDelete; import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.NavigationProperty; import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint; import org.apache.olingo.client.core.edm.xml.AbstractNavigationProperty; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = NavigationPropertyDeserializer.class) public class NavigationPropertyImpl extends AbstractNavigationProperty implements NavigationProperty { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java index 0c117cddb..0c1e3157c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ParameterImpl.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.Parameter; import org.apache.olingo.client.core.edm.xml.AbstractParameter; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.util.ArrayList; +import java.util.List; + public class ParameterImpl extends AbstractParameter implements Parameter { private static final long serialVersionUID = -1067642515116697747L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java index e8d68edef..2f53ade20 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/PropertyImpl.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.Property; import org.apache.olingo.client.core.edm.xml.AbstractProperty; +import java.util.ArrayList; +import java.util.List; + public class PropertyImpl extends AbstractProperty implements Property { private static final long serialVersionUID = -5541908235094985412L; 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 94f1ed7e1..aae95f685 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; import java.net.URI; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class ReferenceDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java index a8d0fd99d..dad2a984a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferenceImpl.java @@ -19,15 +19,14 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.v4.Include; +import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations; +import org.apache.olingo.client.api.edm.xml.v4.Reference; import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.v4.Include; -import org.apache.olingo.client.api.edm.xml.v4.IncludeAnnotations; -import org.apache.olingo.client.api.edm.xml.v4.Reference; - @JsonDeserialize(using = ReferenceDeserializer.class) public class ReferenceImpl extends AbstractAnnotatable implements Reference { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java index 7b1fa7d57..8ef2f925d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReferentialConstraintImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.annotation.JsonProperty; - import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint; public class ReferentialConstraintImpl extends AbstractAnnotatable implements ReferentialConstraint { 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 f11605bab..b8b26dc2a 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 @@ -22,13 +22,12 @@ 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.core.edm.xml.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.io.IOException; + public class ReturnTypeDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java index 1fd4e4876..254d666e7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/ReturnTypeImpl.java @@ -19,7 +19,6 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.v4.ReturnType; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; import org.apache.olingo.commons.api.edm.geo.SRID; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java index 0c6c5a82b..6d0c133f7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SchemaImpl.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.client.api.edm.xml.EnumType; import org.apache.olingo.client.api.edm.xml.v4.Action; import org.apache.olingo.client.api.edm.xml.v4.ActionImport; @@ -42,6 +36,12 @@ import org.apache.olingo.client.api.edm.xml.v4.Term; import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition; import org.apache.olingo.client.core.edm.xml.AbstractSchema; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public class SchemaImpl extends AbstractSchema implements Schema { private static final long serialVersionUID = 4453992249818796144L; 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 758f07d04..514bd0bb9 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class SingletonDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java index ad7592347..bc6799732 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/SingletonImpl.java @@ -19,13 +19,12 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; +import org.apache.olingo.client.api.edm.xml.v4.Singleton; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.v4.NavigationPropertyBinding; -import org.apache.olingo.client.api.edm.xml.v4.Singleton; - @JsonDeserialize(using = SingletonDeserializer.class) public class SingletonImpl extends AbstractAnnotatable implements Singleton { 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 2746c7c59..851722e07 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 @@ -22,15 +22,14 @@ 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 java.util.Arrays; - import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.io.IOException; +import java.util.Arrays; + public class TermDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java index 9d7871086..b8803ca96 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TermImpl.java @@ -19,13 +19,12 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.v4.Term; +import org.apache.olingo.commons.api.edm.geo.SRID; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.v4.Term; -import org.apache.olingo.commons.api.edm.geo.SRID; - @JsonDeserialize(using = TermDeserializer.class) public class TermImpl extends AbstractAnnotatable implements Term { 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 34e33d8c8..d46154bbc 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 @@ -22,13 +22,12 @@ 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.core.edm.xml.AbstractEdmDeserializer; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.io.IOException; + public class TypeDefinitionDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java index 51238628b..0ae4dc13b 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/TypeDefinitionImpl.java @@ -19,15 +19,14 @@ package org.apache.olingo.client.core.edm.xml.v4; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition; import org.apache.olingo.client.core.edm.xml.AbstractEdmItem; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.util.ArrayList; +import java.util.List; + @JsonDeserialize(using = TypeDefinitionDeserializer.class) public class TypeDefinitionImpl extends AbstractEdmItem implements TypeDefinition { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java index 336dc4114..acb1a420e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/XMLMetadataImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.client.core.edm.xml.v4; -import java.util.List; - import org.apache.olingo.client.api.edm.xml.v4.Edmx; import org.apache.olingo.client.api.edm.xml.v4.Reference; import org.apache.olingo.client.api.edm.xml.v4.Schema; import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata; import org.apache.olingo.client.core.edm.xml.AbstractXMLMetadata; +import java.util.List; + public class XMLMetadataImpl extends AbstractXMLMetadata implements XMLMetadata { private static final long serialVersionUID = -7765327879691528010L; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java index bb0843e3d..25c8fed78 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/AbstractAnnotatableDynamicAnnotationExpression.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import java.util.ArrayList; -import java.util.List; import org.apache.olingo.client.api.edm.xml.v4.Annotatable; import org.apache.olingo.client.api.edm.xml.v4.Annotation; +import java.util.ArrayList; +import java.util.List; + abstract class AbstractAnnotatableDynamicAnnotationExpression extends AbstractDynamicAnnotationExpression implements Annotatable { 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 433588048..70df556e0 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class ApplyDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java index 40f8aa170..aa6d25f30 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/ApplyImpl.java @@ -19,13 +19,12 @@ package org.apache.olingo.client.core.edm.xml.v4.annotation; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; +import org.apache.olingo.client.api.edm.xml.v4.annotation.Apply; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; -import org.apache.olingo.client.api.edm.xml.v4.annotation.Apply; - @JsonDeserialize(using = ApplyDeserializer.class) public class ApplyImpl extends AbstractAnnotatableDynamicAnnotationExpression implements 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 e29b9ff8c..f7d65a04d 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 @@ -22,13 +22,12 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; +import org.apache.olingo.commons.api.edm.geo.SRID; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; -import org.apache.olingo.commons.api.edm.geo.SRID; - public class CastDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java index 4278a24df..1a9158e67 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CastImpl.java @@ -18,9 +18,8 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.Cast; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - +import org.apache.olingo.client.api.edm.xml.v4.annotation.Cast; import org.apache.olingo.client.api.edm.xml.v4.annotation.DynamicAnnotationExpression; import org.apache.olingo.commons.api.edm.geo.SRID; 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 8d6a53ca9..e3a4fd193 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class CollectionDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java index ebe1a6588..b470a7f12 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/CollectionImpl.java @@ -18,14 +18,13 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.Collection; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; +import org.apache.olingo.client.api.edm.xml.v4.annotation.Collection; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; - @JsonDeserialize(using = CollectionDeserializer.class) public class CollectionImpl extends AbstractDynamicAnnotationExpression implements Collection { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java index c5054aac1..0b35628c3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/DynamicAnnotationExpressionDeserializer.java @@ -24,7 +24,6 @@ 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.ArrayUtils; import org.apache.commons.lang3.ClassUtils; import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationPath; @@ -43,6 +42,8 @@ import org.apache.olingo.client.api.edm.xml.v4.annotation.TwoParamsOpDynamicAnno import org.apache.olingo.client.api.edm.xml.v4.annotation.UrlRef; import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import java.io.IOException; + public class DynamicAnnotationExpressionDeserializer extends AbstractEdmDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java index aea0e1b1c..23cd104e7 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IfImpl.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.If; import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; +import org.apache.olingo.client.api.edm.xml.v4.annotation.If; public class IfImpl extends AbstractAnnotatableDynamicAnnotationExpression implements If { 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 6539cc44c..f55985a1e 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 @@ -22,13 +22,12 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; +import org.apache.olingo.commons.api.edm.geo.SRID; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; -import org.apache.olingo.commons.api.edm.geo.SRID; - public class IsOfDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java index a281ff890..7ccd035fb 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/IsOfImpl.java @@ -18,10 +18,9 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.IsOf; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.v4.annotation.DynamicAnnotationExpression; +import org.apache.olingo.client.api.edm.xml.v4.annotation.IsOf; import org.apache.olingo.commons.api.edm.geo.SRID; @JsonDeserialize(using = IsOfDeserializer.class) 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 78c5c514f..af5af7f5f 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class LabeledElementDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java index c47b4cc11..7924f1569 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/LabeledElementImpl.java @@ -18,10 +18,9 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.LabeledElement; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.v4.annotation.DynamicAnnotationExpression; +import org.apache.olingo.client.api.edm.xml.v4.annotation.LabeledElement; @JsonDeserialize(using = LabeledElementDeserializer.class) public class LabeledElementImpl 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 86d6b5214..1f17443ea 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class NullDeserializer extends AbstractEdmDeserializer { @Override 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 488c58176..17d5860ce 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class PropertyValueDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueImpl.java index 8038e8858..f884e0235 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/PropertyValueImpl.java @@ -18,10 +18,9 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.PropertyValue; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; +import org.apache.olingo.client.api.edm.xml.v4.annotation.PropertyValue; @JsonDeserialize(using = PropertyValueDeserializer.class) public class PropertyValueImpl extends AbstractAnnotatableDynamicAnnotationExpression implements 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 71f2cb16b..cedc52649 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 @@ -22,12 +22,11 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; +import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.v4.AnnotationImpl; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class RecordDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordImpl.java index 80255a37f..f0e950e8f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/RecordImpl.java @@ -18,11 +18,12 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.Record; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.olingo.client.api.edm.xml.v4.annotation.PropertyValue; +import org.apache.olingo.client.api.edm.xml.v4.annotation.Record; + import java.util.ArrayList; import java.util.List; -import org.apache.olingo.client.api.edm.xml.v4.annotation.PropertyValue; @JsonDeserialize(using = RecordDeserializer.class) public class RecordImpl extends AbstractAnnotatableDynamicAnnotationExpression implements 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 4e54af941..1527599d8 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 @@ -22,11 +22,10 @@ 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 org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; import java.io.IOException; -import org.apache.olingo.client.core.edm.xml.AbstractEdmDeserializer; - public class UrlRefDeserializer extends AbstractEdmDeserializer { @Override diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefImpl.java index 618b99d01..4a5325de0 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/v4/annotation/UrlRefImpl.java @@ -18,10 +18,9 @@ */ package org.apache.olingo.client.core.edm.xml.v4.annotation; -import org.apache.olingo.client.api.edm.xml.v4.annotation.UrlRef; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; - import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression; +import org.apache.olingo.client.api.edm.xml.v4.annotation.UrlRef; @JsonDeserialize(using = UrlRefDeserializer.class) public class UrlRefImpl extends AbstractDynamicAnnotationExpression implements UrlRef { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractHttpClientFactory.java index 271dcc68b..1584870e9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractHttpClientFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractHttpClientFactory.java @@ -18,13 +18,14 @@ */ package org.apache.olingo.client.core.http; -import java.io.InputStream; -import java.util.Properties; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.http.HttpClientFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.InputStream; +import java.util.Properties; + public abstract class AbstractHttpClientFactory implements HttpClientFactory { private static final Logger LOG = LoggerFactory.getLogger(AbstractHttpClientFactory.class); diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractOAuth2HttpUriRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractOAuth2HttpUriRequestFactory.java index 543d4e4a6..e756dcb13 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractOAuth2HttpUriRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/AbstractOAuth2HttpUriRequestFactory.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; import org.apache.http.client.methods.HttpUriRequest; import org.apache.olingo.client.api.http.HttpMethod; +import java.net.URI; + public abstract class AbstractOAuth2HttpUriRequestFactory extends DefaultHttpUriRequestFactory { protected final URI redirectURI; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/BasicAuthHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/BasicAuthHttpClientFactory.java index b9cd98084..aaff790aa 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/BasicAuthHttpClientFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/BasicAuthHttpClientFactory.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; - import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.olingo.client.api.http.HttpMethod; +import java.net.URI; + /** * Implementation for working with Basic Authentication. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpClientFactory.java index fd64c2f8f..06214e0d2 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpClientFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpClientFactory.java @@ -18,12 +18,13 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; import org.apache.http.client.HttpClient; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.params.CoreProtocolPNames; import org.apache.olingo.client.api.http.HttpMethod; +import java.net.URI; + /** * Default implementation returning HttpClients with default parameters. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpUriRequestFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpUriRequestFactory.java index c336b22f6..881546c4e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpUriRequestFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/DefaultHttpUriRequestFactory.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; - import org.apache.http.client.methods.HttpDelete; import org.apache.http.client.methods.HttpGet; import org.apache.http.client.methods.HttpPost; @@ -28,6 +26,8 @@ import org.apache.http.client.methods.HttpUriRequest; import org.apache.olingo.client.api.http.HttpMethod; import org.apache.olingo.client.api.http.HttpUriRequestFactory; +import java.net.URI; + /** * Default implementation returning default HttpUriRequest implementations. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpMerge.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpMerge.java index 3dead8746..c590aae68 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpMerge.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpMerge.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; +import java.net.URI; + /** * Class identifying MERGE HTTP method. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpPatch.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpPatch.java index 9e85cc7b1..cb0c8cf6f 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpPatch.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/HttpPatch.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; +import java.net.URI; + /** * Class identifying PATCH HTTP method. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/NTLMAuthHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/NTLMAuthHttpClientFactory.java index c776bf934..491a0df81 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/NTLMAuthHttpClientFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/NTLMAuthHttpClientFactory.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; - import org.apache.http.auth.AuthScope; import org.apache.http.auth.NTCredentials; import org.apache.http.client.CredentialsProvider; @@ -27,6 +25,8 @@ import org.apache.http.impl.client.BasicCredentialsProvider; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.olingo.client.api.http.HttpMethod; +import java.net.URI; + /** * Implementation for working with NTLM Authentication via embedded HttpClient features. *
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java index 5926e30c0..365df373d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/http/ProxyWrapperHttpClientFactory.java @@ -18,7 +18,6 @@ */ package org.apache.olingo.client.core.http; -import java.net.URI; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; import org.apache.http.auth.UsernamePasswordCredentials; @@ -28,6 +27,8 @@ import org.apache.http.impl.client.DefaultHttpClient; import org.apache.olingo.client.api.http.HttpClientFactory; import org.apache.olingo.client.api.http.HttpMethod; +import java.net.URI; + /** * Implementation for working behind an HTTP proxy (possibly requiring authentication); requires another concrete * {@link HttpClientFactory} implementation acting as real HTTP client factory. diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java index bc36429b5..423249610 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataBinder.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.client.core.serialization; -import java.io.StringWriter; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.data.ServiceDocument; @@ -75,6 +70,11 @@ import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.StringWriter; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public abstract class AbstractODataBinder implements CommonODataBinder { /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataDeserializer.java index 97b858bd1..0e11c588e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataDeserializer.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataDeserializer.java @@ -18,9 +18,16 @@ */ package org.apache.olingo.client.core.serialization; -import java.io.IOException; -import java.io.InputStream; - +import com.fasterxml.aalto.stax.InputFactoryImpl; +import com.fasterxml.aalto.stax.OutputFactoryImpl; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.InjectableValues; +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 org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; import org.apache.olingo.commons.api.data.Property; @@ -33,16 +40,8 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.core.serialization.AtomDeserializer; import org.apache.olingo.commons.core.serialization.JsonDeserializer; -import com.fasterxml.aalto.stax.InputFactoryImpl; -import com.fasterxml.aalto.stax.OutputFactoryImpl; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.InjectableValues; -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 java.io.InputStream; public abstract class AbstractODataDeserializer { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java index 5a32d7064..ec0208e9c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/AbstractODataReader.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.serialization; -import java.io.InputStream; -import java.net.URI; -import java.util.Map; - import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.client.api.data.ServiceDocument; @@ -47,6 +43,10 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.InputStream; +import java.net.URI; +import java.util.Map; + public abstract class AbstractODataReader implements CommonODataReader { /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java index 94cec0be0..01073cfc9 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataWriterImpl.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.client.core.serialization; -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.io.UnsupportedEncodingException; -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.serialization.ODataWriter; @@ -36,6 +28,14 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataSerializerException; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.UnsupportedEncodingException; +import java.util.Collection; +import java.util.Collections; + public class ODataWriterImpl implements ODataWriter { protected final CommonODataClient client; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataDeserializerImpl.java index a5cf31883..35f1cb976 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataDeserializerImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.serialization.v3; -import java.io.InputStream; - -import javax.xml.stream.XMLStreamException; - import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.client.api.serialization.v3.ODataDeserializer; @@ -38,6 +34,9 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.core.serialization.AtomDeserializer; import org.apache.olingo.commons.core.serialization.JsonLinkCollectionDeserializer; +import javax.xml.stream.XMLStreamException; +import java.io.InputStream; + public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { private final ODataFormat format; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataReaderImpl.java index 4661e5859..e0d779c6d 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v3/ODataReaderImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.serialization.v3; -import java.io.InputStream; - import org.apache.olingo.client.api.domain.v3.ODataLinkCollection; import org.apache.olingo.client.api.serialization.v3.ODataReader; import org.apache.olingo.client.api.v3.ODataClient; @@ -32,6 +30,8 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; + public class ODataReaderImpl extends AbstractODataReader implements ODataReader { public ODataReaderImpl(final ODataClient client) { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataBinderImpl.java index 6b9c9c0ef..538ea234e 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataBinderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataBinderImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.serialization.v4; -import java.net.URI; -import java.util.List; - import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.data.ServiceDocumentItem; import org.apache.olingo.client.api.serialization.v4.ODataBinder; @@ -79,6 +76,9 @@ import org.apache.olingo.commons.core.domain.v4.ODataDeltaLinkImpl; import org.apache.olingo.commons.core.domain.v4.ODataPropertyImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; +import java.net.URI; +import java.util.List; + public class ODataBinderImpl extends AbstractODataBinder implements ODataBinder { public ODataBinderImpl(final ODataClient client) { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataDeserializerImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataDeserializerImpl.java index 30f4cb057..148abe8b4 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataDeserializerImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataDeserializerImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.client.core.serialization.v4; -import java.io.InputStream; - -import javax.xml.stream.XMLStreamException; - import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata; import org.apache.olingo.client.api.serialization.v4.ODataDeserializer; @@ -39,6 +35,9 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.core.serialization.AtomDeserializer; import org.apache.olingo.commons.core.serialization.JsonDeltaDeserializer; +import javax.xml.stream.XMLStreamException; +import java.io.InputStream; + public class ODataDeserializerImpl extends AbstractODataDeserializer implements ODataDeserializer { private final ODataFormat format; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataReaderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataReaderImpl.java index 795108bf3..a2ad9b902 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataReaderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/v4/ODataReaderImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.client.core.serialization.v4; -import java.io.InputStream; - import org.apache.olingo.client.api.serialization.v4.ODataReader; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.serialization.AbstractODataReader; @@ -29,6 +27,8 @@ import org.apache.olingo.commons.api.domain.v4.ODataProperty; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; +import java.io.InputStream; + public class ODataReaderImpl extends AbstractODataReader implements ODataReader { public ODataReaderImpl(final ODataClient client) { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterArgFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterArgFactory.java index e55b3a1e2..182404c79 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterArgFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterArgFactory.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.core.uri; -import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.CommonFilterArgFactory; +import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; /** diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterFactory.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterFactory.java index 108c1bfb0..e9ce412de 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterFactory.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractFilterFactory.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.core.uri; -import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.CommonFilterFactory; +import org.apache.olingo.client.api.uri.FilterArg; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractURIBuilder.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractURIBuilder.java index d8c0de6d0..d61487f4c 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractURIBuilder.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/AbstractURIBuilder.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.client.core.uri; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URLDecoder; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; @@ -41,6 +32,15 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.UnsupportedEncodingException; +import java.net.URI; +import java.net.URLDecoder; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; + public abstract class AbstractURIBuilder> implements CommonURIBuilder { protected static class Segment { diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/FilterFunction.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/FilterFunction.java index 3360d4af5..614f44b0a 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/FilterFunction.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/FilterFunction.java @@ -18,8 +18,8 @@ */ package org.apache.olingo.client.core.uri; -import org.apache.olingo.client.api.uri.FilterArg; import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.client.api.uri.FilterArg; public class FilterFunction implements FilterArg { 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 01269dd4b..8ddc27381 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 @@ -18,23 +18,6 @@ */ package org.apache.olingo.client.core.uri; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.math.BigDecimal; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URLEncoder; -import java.sql.Timestamp; -import java.util.Calendar; -import java.util.Collection; -import java.util.Iterator; -import java.util.Map; -import java.util.UUID; -import java.util.regex.Pattern; - -import javax.xml.datatype.Duration; - import org.apache.commons.codec.binary.Hex; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.BooleanUtils; @@ -67,6 +50,22 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmTime; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.xml.datatype.Duration; +import java.io.IOException; +import java.io.InputStream; +import java.io.UnsupportedEncodingException; +import java.math.BigDecimal; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLEncoder; +import java.sql.Timestamp; +import java.util.Calendar; +import java.util.Collection; +import java.util.Iterator; +import java.util.Map; +import java.util.UUID; +import java.util.regex.Pattern; + /** * URI utilities. */ diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/v4/URIBuilderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/v4/URIBuilderImpl.java index e5a156c32..d4073f5f3 100644 --- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/v4/URIBuilderImpl.java +++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/v4/URIBuilderImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.uri.v4; -import java.util.LinkedHashMap; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; import org.apache.olingo.client.api.Configuration; @@ -32,6 +29,9 @@ import org.apache.olingo.client.core.uri.AbstractURIBuilder; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import java.util.LinkedHashMap; +import java.util.Map; + public class URIBuilderImpl extends AbstractURIBuilder implements URIBuilder { public URIBuilderImpl( diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java index cce9881ff..fffa37d0d 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/ODataClientTest.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.client.core; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertEquals; - import org.apache.olingo.client.api.CommonODataClient; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ODataClientTest { @Test diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java index 309cf4b68..43072baff 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/URIEscapeTest.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.client.core.uri; -import static org.junit.Assert.assertEquals; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Arrays; -import java.util.Calendar; -import java.util.Collections; -import java.util.TimeZone; import org.apache.olingo.client.core.edm.EdmEnumTypeImpl; import org.apache.olingo.client.core.edm.xml.v4.EnumTypeImpl; import org.apache.olingo.commons.api.Constants; @@ -36,6 +28,15 @@ import org.apache.olingo.commons.api.edm.geo.Geospatial; import org.apache.olingo.commons.api.edm.geo.Point; import org.junit.Test; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Arrays; +import java.util.Calendar; +import java.util.Collections; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; + public class URIEscapeTest { @Test diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/FilterFactoryTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/FilterFactoryTest.java index 666edf72a..1122eaa5f 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/FilterFactoryTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/FilterFactoryTest.java @@ -18,16 +18,15 @@ */ package org.apache.olingo.client.core.uri.v3; -import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.uri.v3.FilterArgFactory; import org.apache.olingo.client.api.uri.v3.FilterFactory; +import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; +import org.junit.Test; import static org.junit.Assert.assertEquals; -import org.junit.Test; - public class FilterFactoryTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/URIBuilderTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/URIBuilderTest.java index 11227f3b3..80a54c3e1 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/URIBuilderTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v3/URIBuilderTest.java @@ -18,18 +18,18 @@ */ package org.apache.olingo.client.core.uri.v3; -import static org.junit.Assert.assertEquals; +import org.apache.olingo.client.api.uri.v3.URIBuilder; +import org.apache.olingo.client.api.v3.ODataClient; +import org.apache.olingo.client.core.AbstractTest; +import org.apache.olingo.client.core.uri.ParameterAlias; +import org.junit.Test; import java.net.URI; import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import org.apache.olingo.client.api.v3.ODataClient; -import org.apache.olingo.client.api.uri.v3.URIBuilder; -import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.client.core.uri.ParameterAlias; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class URIBuilderTest extends AbstractTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java index 490759c8a..dff0d3419 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/FilterFactoryTest.java @@ -18,16 +18,10 @@ */ package org.apache.olingo.client.core.uri.v4; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Calendar; -import java.util.TimeZone; -import static org.junit.Assert.assertEquals; - -import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.api.uri.URIFilter; import org.apache.olingo.client.api.uri.v4.FilterArgFactory; import org.apache.olingo.client.api.uri.v4.FilterFactory; +import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.client.core.edm.EdmEnumTypeImpl; import org.apache.olingo.client.core.edm.xml.v4.EnumTypeImpl; @@ -37,6 +31,13 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.junit.Test; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Calendar; +import java.util.TimeZone; + +import static org.junit.Assert.assertEquals; + public class FilterFactoryTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/URIBuilderTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/URIBuilderTest.java index 9b8ea7598..3a37b91af 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/URIBuilderTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/uri/v4/URIBuilderTest.java @@ -18,17 +18,18 @@ */ package org.apache.olingo.client.core.uri.v4; -import static org.junit.Assert.assertEquals; +import org.apache.olingo.client.api.uri.QueryOption; +import org.apache.olingo.client.api.uri.v4.URIBuilder; +import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.client.core.AbstractTest; +import org.junit.Test; import java.net.URI; import java.net.URISyntaxException; import java.util.Collections; import java.util.LinkedHashMap; -import org.apache.olingo.client.api.uri.QueryOption; -import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.client.api.uri.v4.URIBuilder; -import org.apache.olingo.client.core.AbstractTest; -import org.junit.Test; + +import static org.junit.Assert.assertEquals; public class URIBuilderTest extends AbstractTest { 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 bacba179c..ed4c147b8 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 @@ -18,17 +18,6 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.StringWriter; - -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -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.core.AbstractTest; @@ -37,6 +26,16 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.custommonkey.xmlunit.Diff; import org.junit.Test; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; +import java.io.ByteArrayInputStream; +import java.io.StringWriter; + +import static org.junit.Assert.assertTrue; + public class AtomTest extends AbstractTest { @Override 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 ea3c3f9c9..daa31a104 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 @@ -18,13 +18,6 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.data.EntitySet; @@ -34,6 +27,13 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.junit.Test; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class EntitySetTest extends AbstractTest { @Override 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 e799215f3..0fb46a6b8 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 @@ -18,13 +18,6 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.InputStream; -import java.net.URI; - import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.data.Entity; @@ -40,6 +33,13 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.junit.Test; +import java.io.InputStream; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class EntityTest extends AbstractTest { @Override 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 94ff0c3fa..1592dee49 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 @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.domain.ODataError; @@ -28,6 +25,9 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ErrorTest extends AbstractTest { @Override 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 3a3ae600c..e94bea622 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 @@ -18,7 +18,13 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertEquals; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.apache.commons.io.IOUtils; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; +import org.apache.olingo.commons.api.format.ODataFormat; import java.io.ByteArrayInputStream; import java.util.ArrayList; @@ -26,14 +32,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.commons.io.IOUtils; -import org.apache.olingo.commons.api.Constants; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import org.apache.olingo.commons.api.format.ODataFormat; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import static org.junit.Assert.assertEquals; public class JSONTest extends AtomTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java index ee838626d..4f95f5ab0 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/MetadataTest.java @@ -18,24 +18,13 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.api.edm.xml.EntityContainer; import org.apache.olingo.client.api.edm.xml.EntityType; import org.apache.olingo.client.api.edm.xml.Schema; import org.apache.olingo.client.api.edm.xml.XMLMetadata; import org.apache.olingo.client.api.edm.xml.v3.FunctionImport; import org.apache.olingo.client.api.http.HttpMethod; +import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; @@ -57,6 +46,17 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.junit.Test; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class MetadataTest extends AbstractTest { @Override 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 307b215e0..f6b822064 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 @@ -18,23 +18,12 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.math.BigDecimal; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Iterator; -import java.util.List; -import java.util.TimeZone; -import java.util.UUID; import org.apache.commons.codec.binary.Base64; import org.apache.commons.lang3.RandomStringUtils; -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.domain.ODataPrimitiveValue; +import org.apache.olingo.commons.api.domain.ODataValue; 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; @@ -47,6 +36,18 @@ import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; import org.junit.Test; +import java.math.BigDecimal; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Iterator; +import java.util.List; +import java.util.TimeZone; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class PrimitiveValueTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PropertyTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PropertyTest.java index 5f5f55bde..14768f44e 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PropertyTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v3/PropertyTest.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.client.core.v3; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.IOException; -import java.io.InputStream; -import java.util.Iterator; - import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.v3.ODataClient; import org.apache.olingo.client.core.AbstractTest; @@ -41,6 +33,14 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.junit.Test; +import java.io.IOException; +import java.io.InputStream; +import java.util.Iterator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class PropertyTest extends AbstractTest { @Override 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 fab9b1f1f..9cc89fa5e 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,16 +19,15 @@ package org.apache.olingo.client.core.v3; import org.apache.olingo.client.api.v3.ODataClient; +import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.client.core.AbstractTest; +import org.junit.Test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import org.junit.Test; - public class ServiceDocumentTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/AtomTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/AtomTest.java index 1ba887cbf..8967e08ad 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/AtomTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/AtomTest.java @@ -18,22 +18,21 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.StringWriter; +import org.apache.commons.io.IOUtils; +import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.client.core.AtomLinksQualifier; +import org.apache.olingo.commons.api.format.ODataFormat; +import org.custommonkey.xmlunit.Diff; import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import java.io.ByteArrayInputStream; +import java.io.StringWriter; -import org.apache.commons.io.IOUtils; -import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.client.core.AtomLinksQualifier; -import org.apache.olingo.commons.api.format.ODataFormat; -import org.custommonkey.xmlunit.Diff; +import static org.junit.Assert.assertTrue; public class AtomTest extends JSONTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java index 3d8c98089..440781585 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntitySetTest.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.data.EntitySet; @@ -36,6 +28,14 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.junit.Test; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + public class EntitySetTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntityTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntityTest.java index c08e825d2..0ffb8552a 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntityTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/EntityTest.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.InputStream; -import java.net.URI; -import java.util.Iterator; - import org.apache.olingo.client.api.v4.EdmEnabledODataClient; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.AbstractTest; @@ -39,8 +30,8 @@ import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataLinkedComplexValue; import org.apache.olingo.commons.api.domain.v4.ODataProperty; -import org.apache.olingo.commons.api.domain.v4.ODataValue; import org.apache.olingo.commons.api.domain.v4.ODataValuable; +import org.apache.olingo.commons.api.domain.v4.ODataValue; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.format.ODataFormat; @@ -49,6 +40,15 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmDateTimeOffset; import org.apache.olingo.commons.core.edm.primitivetype.EdmDuration; import org.junit.Test; +import java.io.InputStream; +import java.net.URI; +import java.util.Iterator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class EntityTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java index 681bf4500..cfd8f6589 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/ErrorTest.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.domain.ODataError; @@ -28,6 +25,9 @@ import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ErrorTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/JSONTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/JSONTest.java index fc1b69d07..b46f42204 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/JSONTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/JSONTest.java @@ -18,17 +18,9 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayInputStream; -import java.io.StringWriter; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.io.IOUtils; import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.AbstractTest; @@ -39,9 +31,16 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.ODataFormat; import org.junit.Test; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.ByteArrayInputStream; +import java.io.StringWriter; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; public class JSONTest extends AbstractTest { diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java index dd69685c1..dcf45c02e 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/MetadataTest.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - import org.apache.olingo.client.api.edm.xml.v4.Annotation; import org.apache.olingo.client.api.edm.xml.v4.Annotations; import org.apache.olingo.client.api.edm.xml.v4.ComplexType; @@ -68,6 +63,11 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmInt32; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class MetadataTest extends AbstractTest { @Override 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 33dd920b0..82509ac00 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 @@ -18,16 +18,17 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; - -import java.util.Calendar; import org.apache.olingo.client.api.v4.ODataClient; -import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.client.core.AbstractTest; +import org.apache.olingo.commons.api.domain.ODataValue; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.util.Calendar; + +import static org.junit.Assert.assertEquals; + public class PrimitiveValueTest extends AbstractTest { @Override diff --git a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java index c4355ed0d..0aab3c7a3 100644 --- a/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java +++ b/lib/client-core/src/test/java/org/apache/olingo/client/core/v4/PropertyTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.InputStream; -import java.util.Iterator; - import org.apache.olingo.client.api.v4.ODataClient; import org.apache.olingo.client.core.AbstractTest; import org.apache.olingo.commons.api.domain.ODataCollectionValue; @@ -36,6 +29,13 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.junit.Test; +import java.io.InputStream; +import java.util.Iterator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class PropertyTest extends AbstractTest { @Override 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 fb298c706..711345a0d 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 @@ -18,21 +18,21 @@ */ package org.apache.olingo.client.core.v4; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.net.URI; - import org.apache.olingo.client.api.data.ServiceDocument; import org.apache.olingo.client.api.v4.ODataClient; +import org.apache.olingo.client.core.AbstractTest; +import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.ODataServiceDocument; import org.apache.olingo.commons.api.format.ODataFormat; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; -import org.apache.olingo.client.core.AbstractTest; -import org.apache.olingo.commons.api.data.ResWrap; import org.junit.Test; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class ServiceDocumentTest extends AbstractTest { @Override diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java index e18739f26..6ee284c7e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/ContextURL.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.api.data; -import java.net.URI; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; +import java.net.URI; + /** * High-level representation of a context URL, built from the string value returned by a service; provides access to the * various components of the context URL, defined in the getPropertyValues(); diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/ODataServiceVersion.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/ODataServiceVersion.java index 2db4038ee..fbebb7140 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/ODataServiceVersion.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/ODataServiceVersion.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.api.edm.constants; +import org.apache.olingo.commons.api.Constants; + import java.util.HashMap; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.Constants; - /** * This class is a container for the supported ODataServiceVersions. */ diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java index d727c2fb7..c8efb771f 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.api.edm.geo; -import java.io.Serializable; - 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.commons.api.edm.EdmPrimitiveTypeKind; +import java.io.Serializable; + /** * Base class for all geospatial info. */ diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/GeospatialCollection.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/GeospatialCollection.java index 7c5b387be..f9d0c806e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/GeospatialCollection.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/GeospatialCollection.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.edm.geo; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import java.util.List; + /** * Wrapper for a collection of geospatials info. */ diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/LineString.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/LineString.java index e3525cb40..41066863e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/LineString.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/LineString.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.edm.geo; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import java.util.List; + public class LineString extends ComposedGeospatial { private static final long serialVersionUID = 3207958185407535907L; diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiLineString.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiLineString.java index fdb8a7a50..1023e7303 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiLineString.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiLineString.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.edm.geo; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import java.util.List; + public class MultiLineString extends ComposedGeospatial { private static final long serialVersionUID = -5042414471218124125L; diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPoint.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPoint.java index bc9bd721f..5c8fd1d9e 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPoint.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPoint.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.edm.geo; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import java.util.List; + public class MultiPoint extends ComposedGeospatial { private static final long serialVersionUID = 4951011255142116129L; diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPolygon.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPolygon.java index 4b7e52241..0f90c53af 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPolygon.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/MultiPolygon.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.edm.geo; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import java.util.List; + public class MultiPolygon extends ComposedGeospatial { private static final long serialVersionUID = -160184788048512883L; diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Polygon.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Polygon.java index 24649004f..e7d09ac43 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Polygon.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Polygon.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.edm.geo; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import java.util.List; + /** * Polygon. */ diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java index 7c67d2059..897e2daae 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/format/ODataFormat.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.api.format; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; + import java.util.HashMap; import java.util.Map; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; - /** * Available formats to be used in various contexts. */ diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java index 8bfe19a9f..d7891a1ea 100755 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataDeserializer.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.api.serialization; -import java.io.InputStream; - import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.ODataError; +import java.io.InputStream; + /** * Interface for de-serialization. */ diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java index 4c2f4a3da..9a72bbba3 100644 --- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java +++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/serialization/ODataSerializer.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.api.serialization; -import java.io.Writer; - import org.apache.olingo.commons.api.data.ResWrap; +import java.io.Writer; + /** * Interface for serialization. */ diff --git a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/data/ContextURLTest.java b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/data/ContextURLTest.java index 7575e825c..6317d668b 100644 --- a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/data/ContextURLTest.java +++ b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/data/ContextURLTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.commons.api.data; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; - -import java.net.URI; - import org.apache.olingo.commons.api.data.ContextURL.Suffix; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -32,6 +25,13 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.junit.Test; import org.mockito.Mockito; +import java.net.URI; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + public class ContextURLTest { @Test diff --git a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java index 20edd1621..9786ccde0 100644 --- a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java +++ b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/AcceptTypeTest.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.api.format; +import org.junit.Test; + +import java.util.List; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.List; - -import org.junit.Test; - public class AcceptTypeTest { @Test diff --git a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java index f160b067e..b1e4547e7 100644 --- a/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java +++ b/lib/commons-api/src/test/java/org/apache/olingo/commons/api/format/ContentTypeTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.api.format; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import org.junit.Test; - public class ContentTypeTest { @Test diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAnnotatedObject.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAnnotatedObject.java index bce5c8abe..d8cdf051b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAnnotatedObject.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractAnnotatedObject.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.commons.core.data; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -28,6 +25,9 @@ import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.olingo.commons.api.data.Annotatable; import org.apache.olingo.commons.api.data.Annotation; +import java.util.ArrayList; +import java.util.List; + public abstract class AbstractAnnotatedObject implements Annotatable { private final List annotations = new ArrayList(); diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractValuable.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractValuable.java index 97fa36e9e..0ef933c57 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractValuable.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/AbstractValuable.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.commons.core.data; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; @@ -33,6 +30,9 @@ import org.apache.olingo.commons.api.data.Valuable; import org.apache.olingo.commons.api.data.ValueType; import org.apache.olingo.commons.api.edm.geo.Geospatial; +import java.util.ArrayList; +import java.util.List; + public abstract class AbstractValuable implements Valuable, Annotatable { private ValueType valueType = null; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeletedEntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeletedEntityImpl.java index 7cccc12f5..657e652c1 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeletedEntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeletedEntityImpl.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.core.data; -import java.net.URI; - import org.apache.olingo.commons.api.data.DeletedEntity; +import java.net.URI; + public class DeletedEntityImpl extends AbstractAnnotatedObject implements DeletedEntity { private URI id; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeltaLinkImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeltaLinkImpl.java index de5cc4be4..91a1569af 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeltaLinkImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/DeltaLinkImpl.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.core.data; -import java.net.URI; - import org.apache.olingo.commons.api.data.DeltaLink; +import java.net.URI; + public class DeltaLinkImpl extends AbstractAnnotatedObject implements DeltaLink { private URI source; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntityImpl.java index 418c9c7e0..8064dc658 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntityImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.data; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.Link; import org.apache.olingo.commons.api.data.Property; import org.apache.olingo.commons.api.domain.ODataOperation; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + /** * Class implementing an OData entity. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntitySetImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntitySetImpl.java index 2721183d3..7898a8c75 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntitySetImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/EntitySetImpl.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.data; +import org.apache.olingo.commons.api.data.Entity; +import org.apache.olingo.commons.api.data.EntitySet; + import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.data.Entity; -import org.apache.olingo.commons.api.data.EntitySet; - public class EntitySetImpl extends AbstractODataObject implements EntitySet { private Integer count; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/LinkedComplexValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/LinkedComplexValueImpl.java index b5d2e71f8..0c3dabd2a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/LinkedComplexValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/LinkedComplexValueImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.data; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.data.Annotation; import org.apache.olingo.commons.api.data.Link; import org.apache.olingo.commons.api.data.LinkedComplexValue; import org.apache.olingo.commons.api.data.Property; +import java.util.ArrayList; +import java.util.List; + public class LinkedComplexValueImpl implements LinkedComplexValue { private final List value = new ArrayList(); diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/LinkCollectionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/LinkCollectionImpl.java index 89fa30555..24ca34dc0 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/LinkCollectionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v3/LinkCollectionImpl.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.data.v3; +import org.apache.olingo.commons.api.data.v3.LinkCollection; +import org.apache.olingo.commons.core.data.AbstractAnnotatedObject; + import java.net.URI; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.data.v3.LinkCollection; -import org.apache.olingo.commons.core.data.AbstractAnnotatedObject; - public class LinkCollectionImpl extends AbstractAnnotatedObject implements LinkCollection { private final List links = new ArrayList(); diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v4/DeltaImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v4/DeltaImpl.java index bd0108add..6dd2a3755 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v4/DeltaImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/data/v4/DeltaImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.data.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.data.DeletedEntity; import org.apache.olingo.commons.api.data.Delta; import org.apache.olingo.commons.api.data.DeltaLink; import org.apache.olingo.commons.core.data.EntitySetImpl; +import java.util.ArrayList; +import java.util.List; + public class DeltaImpl extends EntitySetImpl implements Delta { private final List deletedEntities = new ArrayList(); diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java index 3facb01d7..f268e7385 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataCollectionValue.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.domain; +import org.apache.olingo.commons.api.domain.AbstractODataValue; +import org.apache.olingo.commons.api.domain.ODataCollectionValue; +import org.apache.olingo.commons.api.domain.ODataValue; + import java.util.ArrayList; import java.util.Collection; import java.util.Iterator; import java.util.List; -import org.apache.olingo.commons.api.domain.AbstractODataValue; -import org.apache.olingo.commons.api.domain.ODataCollectionValue; -import org.apache.olingo.commons.api.domain.ODataValue; - /** * OData collection property value. * diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java index 0765a25d1..d884f6ae3 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataComplexValue.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.domain; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.Map; - import org.apache.olingo.commons.api.domain.AbstractODataValue; import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataComplexValue; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; + /** * OData complex property value. * diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java index e90d1dddd..a99712aba 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntity.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.commons.core.domain; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.domain.AbstractODataPayload; import org.apache.olingo.commons.api.domain.CommonODataEntity; @@ -30,6 +26,10 @@ import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.domain.ODataOperation; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + /** * OData entity. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java index 022ab705b..a7cb7acb4 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataEntitySet.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.domain; -import java.net.URI; - import org.apache.olingo.commons.api.domain.AbstractODataPayload; import org.apache.olingo.commons.api.domain.CommonODataEntitySet; +import java.net.URI; + public abstract class AbstractODataEntitySet extends AbstractODataPayload implements CommonODataEntitySet { private static final long serialVersionUID = 9039605899821494024L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataPrimitiveValue.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataPrimitiveValue.java index 4344ac109..9f32cfeaa 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataPrimitiveValue.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/AbstractODataPrimitiveValue.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.commons.core.domain; -import java.util.UUID; - import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.domain.AbstractODataValue; import org.apache.olingo.commons.api.domain.ODataPrimitiveValue; @@ -31,6 +29,8 @@ import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; +import java.util.UUID; + public abstract class AbstractODataPrimitiveValue extends AbstractODataValue implements ODataPrimitiveValue { private static final long serialVersionUID = 8889282662298376036L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java index 91a439268..972e796d9 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntityImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.domain.v3; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataProperty; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.domain.AbstractODataEntity; +import java.util.ArrayList; +import java.util.List; + public class ODataEntityImpl extends AbstractODataEntity implements ODataEntity { private static final long serialVersionUID = 1728326493032709855L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java index 16f3ca423..9709978ad 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataEntitySetImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.domain.v3; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.domain.v3.ODataEntity; import org.apache.olingo.commons.api.domain.v3.ODataEntitySet; import org.apache.olingo.commons.core.domain.AbstractODataEntitySet; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public class ODataEntitySetImpl extends AbstractODataEntitySet implements ODataEntitySet { private static final long serialVersionUID = -8127933181196033586L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataObjectFactoryImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataObjectFactoryImpl.java index 8be2eec88..b04465ad3 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataObjectFactoryImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v3/ODataObjectFactoryImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.commons.core.domain.v3; -import java.net.URI; - import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; @@ -35,6 +33,8 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.domain.AbstractODataObjectFactory; +import java.net.URI; + public class ODataObjectFactoryImpl extends AbstractODataObjectFactory implements ODataObjectFactory { public ODataObjectFactoryImpl(final ODataServiceVersion version) { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java index 9fca95a37..7d944e5e9 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataCollectionValueImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - import org.apache.olingo.commons.api.domain.v4.ODataEnumValue; import org.apache.olingo.commons.api.domain.v4.ODataLinkedComplexValue; import org.apache.olingo.commons.api.domain.v4.ODataValue; import org.apache.olingo.commons.core.domain.AbstractODataCollectionValue; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + public class ODataCollectionValueImpl extends AbstractODataCollectionValue implements ODataValue { private static final long serialVersionUID = 5887168245885401351L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java index 6ee4545d6..af38fad5a 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataComplexValueImpl.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.ODataLink; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; @@ -31,6 +26,11 @@ import org.apache.olingo.commons.api.domain.v4.ODataLinkedComplexValue; import org.apache.olingo.commons.api.domain.v4.ODataProperty; import org.apache.olingo.commons.core.domain.AbstractODataComplexValue; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + public class ODataComplexValueImpl extends AbstractODataComplexValue implements ODataLinkedComplexValue { private static final long serialVersionUID = 1143925901934898802L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java index 1a2cd70f9..08f5f7962 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeletedEntityImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.net.URI; - import org.apache.olingo.commons.api.domain.ODataItem; import org.apache.olingo.commons.api.domain.v4.ODataDeletedEntity; +import java.net.URI; + public class ODataDeletedEntityImpl extends ODataItem implements ODataDeletedEntity { private static final long serialVersionUID = -3841730551749114664L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java index 73f1d69e8..5cb5ee87c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.domain.v4.ODataDeletedEntity; import org.apache.olingo.commons.api.domain.v4.ODataDelta; import org.apache.olingo.commons.api.domain.v4.ODataDeltaLink; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public class ODataDeltaImpl extends ODataEntitySetImpl implements ODataDelta { private static final long serialVersionUID = -418357452933455313L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java index ba0f8a84b..f95f0b432 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataDeltaLinkImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.domain.ODataItem; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.commons.api.domain.v4.ODataDeltaLink; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public class ODataDeltaLinkImpl extends ODataItem implements ODataDeltaLink { private static final long serialVersionUID = -6686550836508873044L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java index 2b8652157..5c506c31d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntityImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataProperty; @@ -29,6 +25,10 @@ import org.apache.olingo.commons.api.domain.v4.ODataSingleton; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.domain.AbstractODataEntity; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public class ODataEntityImpl extends AbstractODataEntity implements ODataEntity, ODataSingleton { private static final long serialVersionUID = -3997704808753685990L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java index 2b6d3a490..dc819f2d4 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataEntitySetImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; import org.apache.olingo.commons.api.domain.v4.ODataEntity; import org.apache.olingo.commons.api.domain.v4.ODataEntitySet; import org.apache.olingo.commons.core.domain.AbstractODataEntitySet; +import java.net.URI; +import java.util.ArrayList; +import java.util.List; + public class ODataEntitySetImpl extends AbstractODataEntitySet implements ODataEntitySet { private static final long serialVersionUID = -8127933181196033586L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataObjectFactoryImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataObjectFactoryImpl.java index 6d52431e4..6c3c79a11 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataObjectFactoryImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataObjectFactoryImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.net.URI; - import org.apache.olingo.commons.api.domain.CommonODataProperty; import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; @@ -39,6 +37,8 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.domain.AbstractODataObjectFactory; +import java.net.URI; + public class ODataObjectFactoryImpl extends AbstractODataObjectFactory implements ODataObjectFactory { public ODataObjectFactoryImpl(final ODataServiceVersion version) { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java index de8b99f48..304333d64 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/domain/v4/ODataPropertyImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.commons.core.domain.v4; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.domain.ODataCollectionValue; import org.apache.olingo.commons.api.domain.ODataComplexValue; import org.apache.olingo.commons.api.domain.v4.ODataAnnotation; @@ -31,6 +28,9 @@ import org.apache.olingo.commons.api.domain.v4.ODataValuable; import org.apache.olingo.commons.api.domain.v4.ODataValue; import org.apache.olingo.commons.core.domain.AbstractODataProperty; +import java.util.ArrayList; +import java.util.List; + public class ODataPropertyImpl extends AbstractODataProperty implements ODataProperty { private static final long serialVersionUID = 4851331227420757747L; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java index 748b8b76b..8427cf334 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdm.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -39,6 +33,12 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public abstract class AbstractEdm implements Edm { protected Map schemas; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java index be52fd631..ecfe38f6d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmBindingTarget.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.Iterator; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -29,6 +27,8 @@ import org.apache.olingo.commons.api.edm.EdmNavigationPropertyBinding; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.Target; +import java.util.Iterator; + public abstract class AbstractEdmBindingTarget extends EdmNamedImpl implements EdmBindingTarget { protected final EdmEntityContainer container; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java index 0e847b49c..ea8f7250d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityContainer.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmActionImport; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -31,6 +26,11 @@ import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + public abstract class AbstractEdmEntityContainer extends EdmNamedImpl implements EdmEntityContainer { protected final FullQualifiedName entityContainerName; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityType.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityType.java index b227c29f4..469a7db1e 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityType.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEntityType.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmException; @@ -31,6 +26,11 @@ import org.apache.olingo.commons.api.edm.EdmStructuredType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + public abstract class AbstractEdmEntityType extends AbstractEdmStructuredType implements EdmEntityType { private final boolean hasStream; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEnumType.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEnumType.java index f6bf5d297..4790deade 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEnumType.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmEnumType.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.ArrayList; -import java.util.Collection; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmMember; @@ -33,6 +27,12 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.core.edm.primitivetype.EdmInt64; +import java.util.ArrayList; +import java.util.Collection; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + public abstract class AbstractEdmEnumType extends EdmTypeImpl implements EdmEnumType { private final boolean isFlags; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java index bae11bbf6..dd7ae8149 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmOperation.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmEntitySet; @@ -33,6 +28,11 @@ import org.apache.olingo.commons.api.edm.EdmReturnType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + public abstract class AbstractEdmOperation extends EdmTypeImpl implements EdmOperation { private final Map parameters = new LinkedHashMap(); diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java index 3520f1800..ad43727df 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmSchema.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.Collections; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmAnnotations; @@ -34,6 +31,9 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.Collections; +import java.util.List; + public abstract class AbstractEdmSchema implements EdmSchema { protected final String namespace; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java index 7272feac9..f6c6af183 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/AbstractEdmStructuredType.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmException; @@ -32,6 +28,10 @@ import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public abstract class AbstractEdmStructuredType extends EdmTypeImpl implements EdmStructuredType { protected EdmStructuredType baseType; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportInfoImpl.java index 545d3f6cc..903cafb78 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportInfoImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmActionImportInfoImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm; -import java.net.URI; - import org.apache.olingo.commons.api.edm.EdmActionImportInfo; import org.apache.olingo.commons.api.edm.EdmException; +import java.net.URI; + public class EdmActionImportInfoImpl extends EdmOperationImportInfoImpl implements EdmActionImportInfo { private String actionImportName; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetInfoImpl.java index 5e411b278..ed1e6a1e3 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetInfoImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmEntitySetInfoImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm; -import java.net.URI; - import org.apache.olingo.commons.api.edm.EdmEntitySetInfo; import org.apache.olingo.commons.api.edm.EdmException; +import java.net.URI; + public class EdmEntitySetInfoImpl implements EdmEntitySetInfo { private final String entityContainerName; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportInfoImpl.java index a1baeca57..928fae57b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportInfoImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmFunctionImportInfoImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm; -import java.net.URI; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmFunctionImportInfo; +import java.net.URI; + public class EdmFunctionImportInfoImpl extends EdmOperationImportInfoImpl implements EdmFunctionImportInfo { private String functionImportName; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonInfoImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonInfoImpl.java index c69a3539e..c8cf56931 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonInfoImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmSingletonInfoImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm; -import java.net.URI; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmSingletonInfo; +import java.net.URI; + public class EdmSingletonInfoImpl implements EdmSingletonInfo { private final String entityContainerName; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java index eabf861b8..5790734f1 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmStructuredTypeHelper.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm; -import java.util.Map; - import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmProperty; +import java.util.Map; + public interface EdmStructuredTypeHelper { Map getProperties(); diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java index dfadc718f..13cf5eba7 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.edm; +import org.apache.olingo.commons.api.edm.EdmException; +import org.apache.olingo.commons.api.edm.FullQualifiedName; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.FullQualifiedName; - public class FunctionMapKey { private final FullQualifiedName functionName; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java index 29ecbb055..06f12d34f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/AbstractEdmAnnotatableDynamicAnnotationExpression.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmAnnotatable; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; +import java.util.ArrayList; +import java.util.List; + public abstract class AbstractEdmAnnotatableDynamicAnnotationExpression extends AbstractEdmDynamicAnnotationExpression implements EdmAnnotatable { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java index e7604f935..1d1e56aa4 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmApplyImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import java.util.List; - import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmApply; +import java.util.List; + public class EdmApplyImpl extends AbstractEdmAnnotatableDynamicAnnotationExpression implements EdmApply { private final String function; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java index da505350d..c6dd5064e 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/annotation/EdmCollectionImpl.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.annotation; -import java.util.List; - import org.apache.olingo.commons.api.edm.annotation.EdmAnnotationExpression; import org.apache.olingo.commons.api.edm.annotation.EdmCollection; +import java.util.List; + public class EdmCollectionImpl extends AbstractEdmDynamicAnnotationExpression implements EdmCollection { private final List items; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java index 066ed7052..afdb4ebbd 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractGeospatialType.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.geo.Geospatial; @@ -39,6 +32,13 @@ import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; import org.apache.olingo.commons.api.edm.geo.SRID; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + public abstract class AbstractGeospatialType extends SingletonPrimitiveType { private static final Pattern PATTERN = diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java index 6e5ec4c24..e13a8eff8 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.math.BigInteger; + /** * Implementation of the EDM primitive type Byte. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDate.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDate.java index c3a179aa4..437ed1846 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDate.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDate.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import java.util.Calendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - /** * Implementation of the EDM primitive type Date. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java index f487e73c0..dd5d0ec60 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTime.java @@ -18,6 +18,8 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import java.sql.Timestamp; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -25,8 +27,6 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - /** * Implementation of the EDM primitive type DateTime. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java index 391adf8b5..aea2ebb2d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java @@ -18,6 +18,8 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import java.sql.Timestamp; import java.text.DecimalFormat; import java.util.Calendar; @@ -26,8 +28,6 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - /** * Implementation of the EDM primitive type DateTimeOffset. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java index bd3789b30..66b0d70cf 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - /** * Implementation of the EDM primitive type Decimal. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java index 91e67e11e..b085d956f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.math.BigDecimal; -import java.util.regex.Pattern; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.math.BigDecimal; +import java.util.regex.Pattern; + /** * Implementation of the EDM primitive type Double. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDuration.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDuration.java index a44c3d3b5..f350b5619 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDuration.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDuration.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import java.math.BigDecimal; import java.math.BigInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - public class EdmDuration extends SingletonPrimitiveType { private static final Pattern PATTERN = Pattern.compile( diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuid.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuid.java index c8398922d..c62ea3153 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuid.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuid.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.util.UUID; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.util.UUID; + /** * Implementation of the EDM primitive type Guid. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java index b3d52feb0..a34d1e1bc 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.math.BigInteger; + /** * Implementation of the EDM primitive type Int16. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java index f584ec985..eeadac9f2 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.math.BigInteger; + /** * Implementation of the EDM primitive type Int32. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java index e8e41a186..c2e9d9a8f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.math.BigInteger; + /** * Implementation of the EDM primitive type Int64. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java index 8c4c1d26e..0aacc013c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.math.BigInteger; + /** * Implementation of the EDM primitive type SByte. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java index b9a299a0a..984bb720d 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.math.BigDecimal; -import java.util.regex.Pattern; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.math.BigDecimal; +import java.util.regex.Pattern; + /** * Implementation of the EDM primitive type Single. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java index a2777a99f..217696838 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStream.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.net.URI; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.net.URI; + /** * Implementation of the EDM primitive type Stream as URI. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java index 42c77142b..14a1772bb 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import java.util.regex.Pattern; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import java.util.regex.Pattern; + /** * Implementation of the EDM primitive type String. */ diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDay.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDay.java index fe1cee5f7..21b7c2f51 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDay.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDay.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import java.sql.Timestamp; import java.util.Calendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - public final class EdmTimeOfDay extends SingletonPrimitiveType { private static final Pattern PATTERN = Pattern.compile( diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AbstractAtomDealer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AbstractAtomDealer.java index e24a596d3..5a382870f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AbstractAtomDealer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AbstractAtomDealer.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.serialization; +import org.apache.commons.lang3.StringUtils; +import org.apache.olingo.commons.api.Constants; +import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; + 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.commons.api.Constants; -import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; - abstract class AbstractAtomDealer { protected static final String TYPE_TEXT = "text"; diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java index b29c17e32..0867b0008 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java @@ -18,22 +18,7 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.InputStream; -import java.net.URI; -import java.text.ParseException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; -import javax.xml.stream.XMLEventReader; -import javax.xml.stream.XMLInputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.events.Attribute; -import javax.xml.stream.events.StartElement; -import javax.xml.stream.events.XMLEvent; - +import com.fasterxml.aalto.stax.InputFactoryImpl; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -72,7 +57,20 @@ import org.apache.olingo.commons.core.data.v3.LinkCollectionImpl; import org.apache.olingo.commons.core.data.v4.DeltaImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import com.fasterxml.aalto.stax.InputFactoryImpl; +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLInputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; +import java.io.InputStream; +import java.net.URI; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class AtomDeserializer extends AbstractAtomDealer implements ODataDeserializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueDeserializer.java index 8789d1e02..37cea8f20 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueDeserializer.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.commons.core.serialization; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import javax.xml.stream.XMLEventReader; -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.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.GeoUtils; @@ -44,6 +34,15 @@ import org.apache.olingo.commons.api.edm.geo.Polygon; import org.apache.olingo.commons.api.edm.geo.SRID; import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + class AtomGeoValueDeserializer { private List points(final XMLEventReader reader, final StartElement start, diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueSerializer.java index 083516cc8..37dd8bf35 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomGeoValueSerializer.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.commons.core.serialization; -import java.util.Collections; -import java.util.Iterator; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.geo.Geospatial; @@ -36,6 +30,11 @@ 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; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; +import java.util.Collections; +import java.util.Iterator; + class AtomGeoValueSerializer { private void points(final XMLStreamWriter writer, final Iterator itor, final boolean wrap) diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java index 5772023c5..79ffd13fd 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomSerializer.java @@ -18,15 +18,7 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.Writer; -import java.util.Collections; -import java.util.List; - -import javax.xml.XMLConstants; -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - +import com.fasterxml.aalto.stax.OutputFactoryImpl; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -53,7 +45,13 @@ import org.apache.olingo.commons.core.data.LinkImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import com.fasterxml.aalto.stax.OutputFactoryImpl; +import javax.xml.XMLConstants; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; +import java.io.Writer; +import java.util.Collections; +import java.util.List; public class AtomSerializer extends AbstractAtomDealer implements ODataSerializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeltaDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeltaDeserializer.java index 13cb5777f..3505df99b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeltaDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeltaDeserializer.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.ContextURL; @@ -33,11 +34,9 @@ import org.apache.olingo.commons.core.data.DeletedEntityImpl; import org.apache.olingo.commons.core.data.DeltaLinkImpl; import org.apache.olingo.commons.core.data.v4.DeltaImpl; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; public class JsonDeltaDeserializer extends JsonDeserializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java index 56c8db8ef..1563e1783 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonDeserializer.java @@ -18,18 +18,13 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.io.InputStream; -import java.util.AbstractMap.SimpleEntry; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.ObjectCodec; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotatable; @@ -59,13 +54,17 @@ import org.apache.olingo.commons.core.data.LinkedComplexValueImpl; import org.apache.olingo.commons.core.data.PropertyImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.core.ObjectCodec; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.io.InputStream; +import java.util.AbstractMap.SimpleEntry; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; public class JsonDeserializer implements ODataDeserializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java index b44bde1fb..6099c1678 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java @@ -18,17 +18,10 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.net.URI; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Matcher; - +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -44,10 +37,16 @@ import org.apache.olingo.commons.core.data.EntityImpl; import org.apache.olingo.commons.core.data.LinkImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import com.fasterxml.jackson.core.JsonParseException; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; /** * Reads JSON string into an entity. diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java index a8191a256..65fb28ec2 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySerializer.java @@ -18,9 +18,7 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -33,7 +31,8 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; +import java.net.URI; /** * Writes out JSON string from an entity. diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java index ae5ba9954..aba91089f 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetDeserializer.java @@ -18,11 +18,9 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.net.URI; -import java.util.Iterator; -import java.util.Map; - +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -33,9 +31,10 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.data.AnnotationImpl; import org.apache.olingo.commons.core.data.EntitySetImpl; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.net.URI; +import java.util.Iterator; +import java.util.Map; /** * Reads JSON string into an entity set. diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java index f0e07be6e..fb21520ac 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java @@ -18,9 +18,7 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -30,7 +28,8 @@ import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; +import java.net.URI; public class JsonEntitySetSerializer extends JsonSerializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java index dec26cd94..bed29dd69 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueDeserializer.java @@ -18,11 +18,7 @@ */ package org.apache.olingo.commons.core.serialization; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Iterator; -import java.util.List; - +import com.fasterxml.jackson.databind.JsonNode; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.GeoUtils; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; @@ -40,7 +36,10 @@ import org.apache.olingo.commons.api.edm.geo.SRID; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; -import com.fasterxml.jackson.databind.JsonNode; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; class JsonGeoValueDeserializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueSerializer.java index 367f25011..a76797b0b 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonGeoValueSerializer.java @@ -18,8 +18,7 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; - +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; @@ -35,7 +34,7 @@ import org.apache.olingo.commons.api.edm.geo.Polygon; import org.apache.olingo.commons.api.edm.geo.SRID; import org.apache.olingo.commons.core.edm.primitivetype.EdmDouble; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; class JsonGeoValueSerializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonLinkCollectionDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonLinkCollectionDeserializer.java index 85a98e925..3b6821551 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonLinkCollectionDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonLinkCollectionDeserializer.java @@ -18,10 +18,11 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.data.v3.LinkCollection; @@ -29,11 +30,9 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.serialization.ODataDeserializerException; import org.apache.olingo.commons.core.data.v3.LinkCollectionImpl; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; public class JsonLinkCollectionDeserializer extends JsonDeserializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java index e75fe8a1c..0611ff25e 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDeserializer.java @@ -18,20 +18,19 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; - +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.domain.ODataErrorDetail; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Iterator; +import java.util.List; public class JsonODataErrorDeserializer extends JsonDeserializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java index f79f154d2..40d93fe7c 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonODataErrorDetailDeserializer.java @@ -18,16 +18,15 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.ResWrap; import org.apache.olingo.commons.api.domain.ODataErrorDetail; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; +import java.io.IOException; +import java.net.URI; public class JsonODataErrorDetailDeserializer extends JsonDeserializer { diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java index 5b4a3749a..ab78a4445 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java @@ -18,11 +18,9 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.net.URI; -import java.util.Iterator; -import java.util.Map; - +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -35,9 +33,10 @@ import org.apache.olingo.commons.core.data.AnnotationImpl; import org.apache.olingo.commons.core.data.PropertyImpl; import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import com.fasterxml.jackson.core.JsonParser; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.net.URI; +import java.util.Iterator; +import java.util.Map; /** * Parse JSON string into Property. diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java index a8423090a..feda16b09 100644 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertySerializer.java @@ -18,9 +18,7 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.net.URI; - +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.data.Annotation; @@ -30,7 +28,8 @@ import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.core.edm.EdmTypeInfo; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; +import java.net.URI; /** * Writes out JSON string from PropertyImpl. diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java index 93bde5deb..bcd59c122 100755 --- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java +++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonSerializer.java @@ -18,13 +18,8 @@ */ package org.apache.olingo.commons.core.serialization; -import java.io.IOException; -import java.io.Writer; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.Constants; @@ -49,8 +44,12 @@ import org.apache.olingo.commons.api.serialization.ODataSerializerException; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; +import java.io.Writer; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public class JsonSerializer implements ODataSerializer { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/DecoderTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/DecoderTest.java index 78ac9cf73..019ef5a4f 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/DecoderTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/DecoderTest.java @@ -18,11 +18,11 @@ ******************************************************************************/ package org.apache.olingo.commons.core; +import org.junit.Test; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; -import org.junit.Test; - /** * */ diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/EncoderTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/EncoderTest.java index c6563e6b4..74eb1af77 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/EncoderTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/EncoderTest.java @@ -18,12 +18,12 @@ ******************************************************************************/ package org.apache.olingo.commons.core; -import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.net.URI; import java.net.URISyntaxException; -import org.junit.Test; +import static org.junit.Assert.assertEquals; /** * Tests for percent-encoding. diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/ActionMapKeyTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/ActionMapKeyTest.java index 18e37e1a2..ea5c9ec16 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/ActionMapKeyTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/ActionMapKeyTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.edm; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.fail; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.fail; + public class ActionMapKeyTest { private final FullQualifiedName fqn = new FullQualifiedName("namespace", "name"); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java index 683f9c2f2..416f99dba 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java @@ -18,19 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.commons.lang3.StringUtils; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; @@ -49,6 +36,19 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmImplCachingTest { private final FullQualifiedName NAME1 = new FullQualifiedName("testNamespace1", "testName1"); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java index 4d8f761db..24955bed4 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java @@ -18,19 +18,6 @@ */ package org.apache.olingo.commons.core.edm; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -48,6 +35,19 @@ import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmImplCallCreateTest { private final FullQualifiedName FQN = new FullQualifiedName("testNamespace", "testName"); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/FunctionMapKeyTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/FunctionMapKeyTest.java index 10b541dff..36c50ae98 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/FunctionMapKeyTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/FunctionMapKeyTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.edm; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotSame; +import org.apache.olingo.commons.api.edm.FullQualifiedName; +import org.junit.Test; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.FullQualifiedName; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; public class FunctionMapKeyTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java index 39b4e5d74..1e686c7b9 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java @@ -18,21 +18,21 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.apache.olingo.commons.api.edm.EdmType; +import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.junit.Test; import java.math.BigDecimal; import java.sql.Timestamp; import java.util.Calendar; import java.util.UUID; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java index f8966d733..2f14c79b0 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - -import java.util.Arrays; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.util.Arrays; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class EdmBinaryTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Binary); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java index c1795de5e..5578ad0ae 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class EdmBooleanTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java index 097cfc3f2..74e434d61 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.math.BigInteger; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class EdmByteTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Byte); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java index fe8b57779..6e10d2bb3 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.junit.Test; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class EdmDateTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java index ce52e1d87..301391615 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java @@ -18,17 +18,17 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.junit.Test; import java.sql.Timestamp; import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class EdmDateTimeOffsetTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java index 9117fdf4e..a592351e2 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.junit.Test; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class EdmDecimalTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java index 693314cd0..3d0ecbf16 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.junit.Test; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class EdmDoubleTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java index 8e0df6397..8a55d0789 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.junit.Test; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class EdmDurationTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeoTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeoTest.java index bb1d44f22..e3ac6b0f4 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeoTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGeoTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.util.Iterator; - 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; @@ -36,6 +29,13 @@ import org.apache.olingo.commons.api.edm.geo.Point; import org.apache.olingo.commons.api.edm.geo.Polygon; import org.junit.Test; +import java.util.Iterator; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + public class EdmGeoTest extends PrimitiveTypeBaseTest { @Test diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java index fb8946574..a015550ad 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; - -import java.util.UUID; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; + public class EdmGuidTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Guid); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java index 3ee77feb2..c1f4b9a88 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.math.BigInteger; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class EdmInt16Test extends PrimitiveTypeBaseTest { final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int16); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java index 319b46688..2f1314f66 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.math.BigInteger; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class EdmInt32Test extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int32); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java index 536571a8b..003005316 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.math.BigInteger; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class EdmInt64Test extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Int64); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java index 5a3bebfc0..ac6928135 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertNull; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import static org.junit.Assert.assertNull; + public class EdmNullTest extends PrimitiveTypeBaseTest { @Test diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java index 1e5136d8e..9721384b1 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - -import java.math.BigInteger; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import java.math.BigInteger; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + public class EdmSByteTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.SByte); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java index bd1cf2f1f..1e400c225 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.junit.Test; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; public class EdmSingleTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java index 141dbc1a4..5aa95d873 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; - import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class EdmStringTest extends PrimitiveTypeBaseTest { private final EdmPrimitiveType instance = EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.String); diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java index 7875e0795..297fd82bd 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertEquals; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; +import org.junit.Test; import java.util.Calendar; import java.util.TimeZone; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class EdmTimeOfDayTest extends PrimitiveTypeBaseTest { diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java index 1d1a31efe..9761dc991 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - public abstract class PrimitiveTypeBaseTest { private void expectErrorInValueToString(final EdmPrimitiveType instance, diff --git a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java index 496086bfd..d95699d4f 100644 --- a/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java +++ b/lib/commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.commons.core.edm.primitivetype; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.junit.Test; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + public class UInt7Test extends PrimitiveTypeBaseTest { @Test diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java index 1765d33d2..03e5e389a 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataHttpHandler.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.server.api; +import org.apache.olingo.server.api.processor.Processor; + import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.olingo.server.api.processor.Processor; - /** * Handels http requests as OData requests. */ diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java index ab6332bb4..bba70e2b6 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/ODataRequest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.api; +import org.apache.olingo.commons.api.http.HttpMethod; + import java.io.InputStream; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.http.HttpMethod; - /** * Request object carry http information optimized and required to handle OData requests only. */ diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Annotation.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Annotation.java index bfd4ce6a1..a4a493765 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Annotation.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Annotation.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class Annotation { private FullQualifiedName term; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/BindingTarget.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/BindingTarget.java index 2c5cbf6c6..1ca52ffef 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/BindingTarget.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/BindingTarget.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public abstract class BindingTarget { protected String name; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ComplexType.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ComplexType.java index c98746ed4..9ef47ca80 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ComplexType.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/ComplexType.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class ComplexType extends StructuredType { @Override diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EdmProvider.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EdmProvider.java index 5740d7f65..4b28e7451 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EdmProvider.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EdmProvider.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public abstract class EdmProvider { /** diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityContainer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityContainer.java index 0213198be..3b993e15f 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityContainer.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityContainer.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class EntityContainer { private String name; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntitySet.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntitySet.java index 74aa183ce..361d15a8f 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntitySet.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntitySet.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class EntitySet extends BindingTarget { private boolean includeInServiceDocument = true; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityType.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityType.java index 8bc097932..3f3db5bc6 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityType.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EntityType.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class EntityType extends StructuredType { private List key; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EnumType.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EnumType.java index 14bf66df7..ee213e5e8 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EnumType.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/EnumType.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class EnumType { private String name; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/NavigationProperty.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/NavigationProperty.java index 4345f0fe0..73f43ff61 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/NavigationProperty.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/NavigationProperty.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmOnDelete; +import java.util.List; + public class NavigationProperty { private String name; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Singleton.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Singleton.java index d4ca689ab..c7dc88538 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Singleton.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Singleton.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class Singleton extends BindingTarget { @Override diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/StructuredType.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/StructuredType.java index 6d0a161a2..8f0d8666c 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/StructuredType.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/StructuredType.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public abstract class StructuredType { protected String name; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Term.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Term.java index 44a69879a..1303de8f0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Term.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/edm/provider/Term.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.FullQualifiedName; +import java.util.List; + public class Term { private String name; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java index 49bdae09b..459538535 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/processor/DefaultProcessor.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.api.processor; -import java.io.InputStream; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.format.ODataFormat; @@ -30,6 +28,8 @@ import org.apache.olingo.server.api.ODataResponse; import org.apache.olingo.server.api.serializer.ODataSerializer; import org.apache.olingo.server.api.uri.UriInfo; +import java.io.InputStream; + /** * Processor implementation for handling of metadata and service document. This implementation is registerd in the * ODataHandler by default. The default can be replaced by re-registering an custom implementation. diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java index 24e18da98..8f2bdd585 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/ODataSerializer.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.api.serializer; -import java.io.InputStream; - import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; @@ -27,6 +25,8 @@ import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntitySet; +import java.io.InputStream; + public interface ODataSerializer { public static final String DEFAULT_CHARSET = "UTF-8"; diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java index e81732058..a4af58881 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.uri; -import java.util.Collection; - import org.apache.olingo.server.api.uri.queryoption.SystemQueryOption; +import java.util.Collection; + /** * Object acting as general access to URI information extracted from the request URI. Depending on * the URI info kind different interfaces are used to provide access to that information.

diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java index b1159ffa2..341251719 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.api.uri; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption; import org.apache.olingo.server.api.uri.queryoption.ExpandOption; @@ -27,6 +25,8 @@ import org.apache.olingo.server.api.uri.queryoption.FormatOption; import org.apache.olingo.server.api.uri.queryoption.IdOption; import org.apache.olingo.server.api.uri.queryoption.SelectOption; +import java.util.List; + /** * Used for URI info kind {@link UriInfoKind#entityId} to describe URIs like * http://.../serviceroot/$entity... diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java index cc3077a4a..f663c2f9e 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoResource.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.api.uri; -import java.util.List; - import org.apache.olingo.server.api.uri.queryoption.CountOption; import org.apache.olingo.server.api.uri.queryoption.CustomQueryOption; import org.apache.olingo.server.api.uri.queryoption.ExpandOption; @@ -33,6 +31,8 @@ import org.apache.olingo.server.api.uri.queryoption.SkipOption; import org.apache.olingo.server.api.uri.queryoption.SkipTokenOption; import org.apache.olingo.server.api.uri.queryoption.TopOption; +import java.util.List; + /** * Used for URI info kind {@link UriInfoKind#resource} to describe URIs like * E.g. http://.../serviceroot/entitySet diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java index d0fd554ee..d7f35fb9a 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceEntitySet.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.server.api.uri; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmType; +import java.util.List; + /** * Used to describe an entity set used within an resource path * For example: http://.../serviceroot/entityset(1) diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java index 7ead9d6ac..dea2256fc 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.server.api.uri; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmType; +import java.util.List; + /** * Used to describe an function import or bound function used within an resource path * For example: http://.../serviceroot/functionImport(P1=1,P2='A') diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java index 1e43639c0..9139edf96 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.server.api.uri; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmType; +import java.util.List; + /** * Used to describe an navigation property used within an resource path * For example: http://.../serviceroot/entityset(1)/navProperty diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/Enumeration.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/Enumeration.java index c72a0a0fc..641794ca0 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/Enumeration.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/Enumeration.java @@ -18,10 +18,10 @@ */ package org.apache.olingo.server.api.uri.queryoption.expression; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmEnumType; +import java.util.List; + /** * Represents a enumeration expression node in the expression tree *
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java index 83c146b4a..06142ff76 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/queryoption/expression/ExpressionVisitor.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.server.api.uri.queryoption.expression; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.UriInfoResource; +import java.util.List; + /** * Generic interface to define expression visitors with arbitrary return types. * diff --git a/lib/server-api/src/test/java/org/apache/olingo/server/api/ODataRequestTest.java b/lib/server-api/src/test/java/org/apache/olingo/server/api/ODataRequestTest.java index 34b497fef..d2f9bef64 100644 --- a/lib/server-api/src/test/java/org/apache/olingo/server/api/ODataRequestTest.java +++ b/lib/server-api/src/test/java/org/apache/olingo/server/api/ODataRequestTest.java @@ -18,11 +18,11 @@ */ package org.apache.olingo.server.api; -import static org.junit.Assert.assertEquals; +import org.junit.Test; import java.util.Arrays; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class ODataRequestTest { diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiator.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiator.java index 793af7bf6..3879442eb 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiator.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ContentNegotiator.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.commons.api.format.AcceptType; @@ -36,6 +33,9 @@ import org.apache.olingo.server.api.uri.queryoption.FormatOption; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.List; + public class ContentNegotiator { private final static Logger LOG = LoggerFactory.getLogger(ContentNegotiator.class); diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java index e769f789a..a1f191123 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHandler.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core; -import java.util.HashMap; -import java.util.Map; - import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; @@ -45,6 +42,9 @@ import org.apache.olingo.server.core.uri.validator.UriValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.HashMap; +import java.util.Map; + public class ODataHandler { private final static Logger LOG = LoggerFactory.getLogger(ODataHandler.class); diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java index 2a84b0e97..06f0559e1 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataHttpHandlerImpl.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.server.core; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.List; -import java.util.Map.Entry; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.http.HttpHeader; @@ -41,6 +30,16 @@ import org.apache.olingo.server.api.processor.Processor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.List; +import java.util.Map.Entry; + public class ODataHttpHandlerImpl implements ODataHttpHandler { private static final Logger LOG = LoggerFactory.getLogger(ODataHttpHandlerImpl.class); diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java index a8bac25d0..bd3df0af4 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmBindingTargetImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmNavigationPropertyBinding; @@ -30,6 +27,9 @@ import org.apache.olingo.commons.core.edm.EdmNavigationPropertyBindingImpl; import org.apache.olingo.server.api.edm.provider.BindingTarget; import org.apache.olingo.server.api.edm.provider.NavigationPropertyBinding; +import java.util.ArrayList; +import java.util.List; + public abstract class EdmBindingTargetImpl extends AbstractEdmBindingTarget { private final BindingTarget target; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java index 2efefa9cd..36c519315 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; @@ -31,6 +28,9 @@ import org.apache.olingo.commons.core.edm.AbstractEdmComplexType; import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; import org.apache.olingo.server.api.edm.provider.ComplexType; +import java.util.List; +import java.util.Map; + public class EdmComplexTypeImpl extends AbstractEdmComplexType { private final EdmStructuredTypeHelper helper; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java index e9ee3120d..1ed8d56dc 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmActionImport; @@ -39,6 +37,8 @@ import org.apache.olingo.server.api.edm.provider.EntitySet; import org.apache.olingo.server.api.edm.provider.FunctionImport; import org.apache.olingo.server.api.edm.provider.Singleton; +import java.util.List; + public class EdmEntityContainerImpl extends AbstractEdmEntityContainer { private final EdmProvider provider; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java index eb428d373..a2926eb77 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -27,6 +25,8 @@ import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.server.api.edm.provider.EntitySet; +import java.util.List; + public class EdmEntitySetImpl extends EdmBindingTargetImpl implements EdmEntitySet { private EntitySet entitySet; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java index 594d704ab..bfc31e6c7 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -35,6 +31,10 @@ import org.apache.olingo.commons.core.edm.EdmStructuredTypeHelper; import org.apache.olingo.server.api.edm.provider.EntityType; import org.apache.olingo.server.api.edm.provider.PropertyRef; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + public class EdmEntityTypeImpl extends AbstractEdmEntityType { private final EdmStructuredTypeHelper helper; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java index 66c115c7b..95413ae45 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEnumTypeImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmMember; @@ -32,6 +29,9 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.server.api.edm.provider.EnumMember; import org.apache.olingo.server.api.edm.provider.EnumType; +import java.util.ArrayList; +import java.util.List; + public class EdmEnumTypeImpl extends AbstractEdmEnumType implements EdmEnumType { private final EdmPrimitiveType underlyingType; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java index d370d08f0..e07eb9f76 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -28,6 +26,8 @@ import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edm.provider.FunctionImport; +import java.util.List; + public class EdmFunctionImportImpl extends EdmOperationImportImpl implements EdmFunctionImport { private final FunctionImport functionImport; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java index f6f23ea6a..5ffe03158 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmMemberImpl.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.core.edm.AbstractEdmMember; +import java.util.List; + public class EdmMemberImpl extends AbstractEdmMember { public EdmMemberImpl(final Edm edm, final FullQualifiedName enumFQN, final String name, final String value) { diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java index 4e5ad8581..75623604f 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmReferentialConstraint; @@ -30,6 +27,9 @@ import org.apache.olingo.commons.core.edm.AbstractEdmNavigationProperty; import org.apache.olingo.server.api.edm.provider.NavigationProperty; import org.apache.olingo.server.api.edm.provider.ReferentialConstraint; +import java.util.ArrayList; +import java.util.List; + public class EdmNavigationPropertyImpl extends AbstractEdmNavigationProperty { private final FullQualifiedName structuredTypeName; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java index e9d866cd2..0b5a8f27b 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmParameter; @@ -32,6 +29,9 @@ import org.apache.olingo.server.api.edm.provider.EntitySetPath; import org.apache.olingo.server.api.edm.provider.Operation; import org.apache.olingo.server.api.edm.provider.Parameter; +import java.util.ArrayList; +import java.util.List; + public abstract class EdmOperationImpl extends AbstractEdmOperation { protected final Operation operation; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java index 0998c3bfc..2cc85d006 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmOperationImportImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -27,6 +25,8 @@ import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.core.edm.AbstractEdmOperationImport; import org.apache.olingo.server.api.edm.provider.OperationImport; +import java.util.List; + public abstract class EdmOperationImportImpl extends AbstractEdmOperationImport { public EdmOperationImportImpl(final Edm edm, final EdmEntityContainer container, diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java index d67b0d18f..53b46d2b2 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmParameterImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmMapping; @@ -28,6 +26,8 @@ import org.apache.olingo.commons.api.edm.geo.SRID; import org.apache.olingo.commons.core.edm.AbstractEdmParameter; import org.apache.olingo.server.api.edm.provider.Parameter; +import java.util.List; + public class EdmParameterImpl extends AbstractEdmParameter { private final Parameter parameter; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java index 1a064e8c2..e55bb35ab 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmMapping; @@ -31,6 +29,8 @@ import org.apache.olingo.commons.core.edm.AbstractEdmProperty; import org.apache.olingo.commons.core.edm.EdmTypeInfo; import org.apache.olingo.server.api.edm.provider.Property; +import java.util.List; + public class EdmPropertyImpl extends AbstractEdmProperty implements EdmProperty { private final FullQualifiedName structuredTypeName; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java index 010b56af5..7973c4317 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmProviderImpl.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -53,6 +46,13 @@ import org.apache.olingo.server.api.edm.provider.Parameter; import org.apache.olingo.server.api.edm.provider.Schema; import org.apache.olingo.server.api.edm.provider.TypeDefinition; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + public class EdmProviderImpl extends AbstractEdm { private final EdmProvider provider; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java index f66a1ed2b..700774089 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmReferentialConstraintImpl.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.commons.core.edm.AbstractEdmReferentialConstraint; +import java.util.List; + public class EdmReferentialConstraintImpl extends AbstractEdmReferentialConstraint { public EdmReferentialConstraintImpl(final String property, final String referencedProperty) { diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java index 21de85d11..e350d96ea 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmAnnotation; @@ -44,6 +40,10 @@ import org.apache.olingo.server.api.edm.provider.Function; import org.apache.olingo.server.api.edm.provider.Schema; import org.apache.olingo.server.api.edm.provider.TypeDefinition; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + public class EdmSchemaImpl extends AbstractEdmSchema { private final Schema schema; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImpl.java index d41a48993..cde3d8362 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmActionImportInfo; import org.apache.olingo.commons.api.edm.EdmEntitySetInfo; @@ -42,6 +38,10 @@ import org.apache.olingo.server.api.edm.provider.FunctionImport; import org.apache.olingo.server.api.edm.provider.Schema; import org.apache.olingo.server.api.edm.provider.Singleton; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + public class EdmServiceMetadataImpl implements EdmServiceMetadata { private EdmProvider provider; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java index fe210429d..41efc5443 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -27,6 +25,8 @@ import org.apache.olingo.commons.api.edm.EdmSingleton; import org.apache.olingo.commons.api.edm.EdmTerm; import org.apache.olingo.server.api.edm.provider.Singleton; +import java.util.List; + public class EdmSingletonImpl extends EdmBindingTargetImpl implements EdmSingleton { public EdmSingletonImpl(final Edm edm, final EdmEntityContainer container, final Singleton singleton) { diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java index 811a3aa19..cc4c7f13a 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmStructuredTypeHelperImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.LinkedHashMap; -import java.util.Map; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmProperty; @@ -30,6 +27,9 @@ import org.apache.olingo.server.api.edm.provider.NavigationProperty; import org.apache.olingo.server.api.edm.provider.Property; import org.apache.olingo.server.api.edm.provider.StructuredType; +import java.util.LinkedHashMap; +import java.util.Map; + public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper { private final Edm edm; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java index a4113769f..b1f00c984 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAnnotation; import org.apache.olingo.commons.api.edm.EdmException; @@ -33,6 +31,8 @@ import org.apache.olingo.commons.core.edm.AbstractEdmTypeDefinition; import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.server.api.edm.provider.TypeDefinition; +import java.util.List; + public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition implements EdmTypeDefinition { private TypeDefinition typeDefinition; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/ODataXmlSerializerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/ODataXmlSerializerImpl.java index da8380879..ad7c80c02 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/ODataXmlSerializerImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/ODataXmlSerializerImpl.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.server.core.serializer; -import java.io.InputStream; - -import javax.xml.stream.XMLOutputFactory; -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.Entity; @@ -37,6 +31,11 @@ import org.apache.olingo.server.core.serializer.xml.MetadataDocumentXmlSerialize import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.xml.stream.XMLOutputFactory; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; +import java.io.InputStream; + public class ODataXmlSerializerImpl implements ODataSerializer { private static final Logger log = LoggerFactory.getLogger(ODataXmlSerializerImpl.class); diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java index 6d565ac42..b6357425b 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializer.java @@ -18,14 +18,13 @@ */ package org.apache.olingo.server.core.serializer.json; -import java.io.IOException; - +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.domain.ODataError; import org.apache.olingo.commons.api.domain.ODataErrorDetail; -import com.fasterxml.jackson.core.JsonGenerationException; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; public class ODataErrorSerializer { diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java index e1f1992f8..cc817de5a 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializer.java @@ -18,12 +18,9 @@ */ package org.apache.olingo.server.core.serializer.json; -import java.io.BufferedWriter; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStreamWriter; -import java.util.List; - +import com.fasterxml.jackson.core.JsonFactory; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import org.apache.olingo.commons.api.Constants; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.data.ContextURL; @@ -48,9 +45,11 @@ import org.apache.olingo.server.core.serializer.utils.CircleStreamBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.core.JsonFactory; -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; +import java.io.BufferedWriter; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.util.List; public class ODataJsonSerializer implements ODataSerializer { diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java index bc126596a..95a8b3914 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentJsonSerializer.java @@ -18,16 +18,15 @@ */ package org.apache.olingo.server.core.serializer.json; -import java.io.IOException; - +import com.fasterxml.jackson.core.JsonGenerationException; +import com.fasterxml.jackson.core.JsonGenerator; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmSingleton; -import com.fasterxml.jackson.core.JsonGenerationException; -import com.fasterxml.jackson.core.JsonGenerator; +import java.io.IOException; public class ServiceDocumentJsonSerializer { public static final String ODATA_CONTEXT = "@odata.context"; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java index 8214326ee..4e9b5379e 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentXmlSerializer.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.server.core.serializer.xml; -import java.util.List; - -import javax.xml.stream.XMLStreamException; -import javax.xml.stream.XMLStreamWriter; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; @@ -50,6 +45,10 @@ import org.apache.olingo.commons.api.edm.EdmTypeDefinition; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.serializer.ODataSerializer; +import javax.xml.stream.XMLStreamException; +import javax.xml.stream.XMLStreamWriter; +import java.util.List; + public class MetadataDocumentXmlSerializer { private static final String XML_EXTENDS = "Extends"; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java index 5992d9091..ee855eb6f 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriInfoImpl.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.server.core.uri; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.server.api.uri.UriInfo; @@ -54,6 +48,12 @@ import org.apache.olingo.server.core.uri.queryoption.CustomQueryOptionImpl; import org.apache.olingo.server.core.uri.queryoption.QueryOptionImpl; import org.apache.olingo.server.core.uri.queryoption.SystemQueryOptionImpl; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + public class UriInfoImpl implements UriInfo { private UriInfoKind kind; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceFunctionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceFunctionImpl.java index 6f23d23c4..8daa810b9 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceFunctionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceFunctionImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; import org.apache.olingo.commons.api.edm.EdmType; @@ -28,6 +25,9 @@ import org.apache.olingo.server.api.uri.UriParameter; import org.apache.olingo.server.api.uri.UriResourceFunction; import org.apache.olingo.server.api.uri.UriResourceKind; +import java.util.ArrayList; +import java.util.List; + /** * Covers Function imports and BoundFunction in URI */ diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java index aef580017..19d363986 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.server.core.uri; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.uri.UriParameter; import org.apache.olingo.server.api.uri.UriResourceKind; import org.apache.olingo.server.api.uri.UriResourcePartTyped; +import java.util.ArrayList; +import java.util.List; + public abstract class UriResourceWithKeysImpl extends UriResourceImpl implements UriResourcePartTyped { protected EdmType collectionTypeFilter = null; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/CheckFullContextListener.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/CheckFullContextListener.java index b1467f77f..2b529bd76 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/CheckFullContextListener.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/CheckFullContextListener.java @@ -18,8 +18,6 @@ ******************************************************************************/ package org.apache.olingo.server.core.uri.parser; -import java.util.BitSet; - import org.antlr.v4.runtime.DiagnosticErrorListener; import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.RecognitionException; @@ -27,6 +25,8 @@ import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.atn.ATNConfigSet; import org.antlr.v4.runtime.dfa.DFA; +import java.util.BitSet; + class CheckFullContextListener extends DiagnosticErrorListener { @Override diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java index b2e23ead1..535359f8c 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.parser; -import java.util.ArrayList; -import java.util.List; - import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.BailErrorStrategy; import org.antlr.v4.runtime.CommonTokenStream; @@ -59,6 +56,9 @@ import org.apache.olingo.server.core.uri.queryoption.SkipOptionImpl; import org.apache.olingo.server.core.uri.queryoption.SkipTokenOptionImpl; import org.apache.olingo.server.core.uri.queryoption.TopOptionImpl; +import java.util.ArrayList; +import java.util.List; + public class Parser { int logLevel = 0; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java index 814846660..eb6f16a36 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriContext.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.core.uri.parser; -import java.util.Stack; - import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.server.core.uri.UriInfoImpl; import org.apache.olingo.server.core.uri.parser.UriParseTreeVisitor.TypeInformation; import org.apache.olingo.server.core.uri.queryoption.ExpandItemImpl; import org.apache.olingo.server.core.uri.queryoption.SelectItemImpl; +import java.util.Stack; + public class UriContext { public static class LambdaVariables { diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java index cf9606c47..dc704fca5 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java @@ -18,6 +18,9 @@ */ package org.apache.olingo.server.core.uri.parser; +import org.apache.olingo.commons.core.Decoder; +import org.apache.olingo.server.core.uri.parser.RawUri.QueryOption; + import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; @@ -25,9 +28,6 @@ import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.core.Decoder; -import org.apache.olingo.server.core.uri.parser.RawUri.QueryOption; - public class UriDecoder { static Pattern uriPattern = Pattern.compile("^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\\?([^#]*))?(#(.*))?"); diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java index b3c4d498e..ea242689b 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.parser; -import java.util.ArrayList; -import java.util.List; - import org.antlr.v4.runtime.misc.ParseCancellationException; import org.antlr.v4.runtime.tree.ParseTree; import org.apache.olingo.commons.api.edm.Edm; @@ -179,6 +176,9 @@ import org.apache.olingo.server.core.uri.queryoption.expression.MemberImpl; import org.apache.olingo.server.core.uri.queryoption.expression.MethodImpl; import org.apache.olingo.server.core.uri.queryoption.expression.TypeLiteralImpl; +import java.util.ArrayList; +import java.util.List; + /** * UriVisitor * diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java index 12985eebf..f5b10e3cd 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandItemImpl.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.uri.queryoption; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.server.api.uri.UriInfoResource; import org.apache.olingo.server.api.uri.queryoption.CountOption; @@ -34,6 +32,8 @@ import org.apache.olingo.server.api.uri.queryoption.SkipOption; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; import org.apache.olingo.server.api.uri.queryoption.TopOption; +import java.util.List; + public class ExpandItemImpl implements ExpandItem { private LevelsExpandOption levelsExpandOption; private FilterOption filterOption; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java index 6cedc15a6..33dbef5cd 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/ExpandOptionImpl.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.server.core.uri.queryoption; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.server.api.uri.queryoption.ExpandItem; import org.apache.olingo.server.api.uri.queryoption.ExpandOption; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; +import java.util.ArrayList; +import java.util.List; + public class ExpandOptionImpl extends SystemQueryOptionImpl implements ExpandOption { List expandItems = new ArrayList(); diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java index a278682c1..c7f5c9f6e 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/OrderByOptionImpl.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.server.core.uri.queryoption; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.server.api.uri.queryoption.OrderByItem; import org.apache.olingo.server.api.uri.queryoption.OrderByOption; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; +import java.util.ArrayList; +import java.util.List; + public class OrderByOptionImpl extends SystemQueryOptionImpl implements OrderByOption { private List orders = new ArrayList(); diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java index b7ead9c62..393322fd9 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/SelectOptionImpl.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.server.core.uri.queryoption; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.server.api.uri.queryoption.SelectItem; import org.apache.olingo.server.api.uri.queryoption.SelectOption; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; +import java.util.ArrayList; +import java.util.List; + public class SelectOptionImpl extends SystemQueryOptionImpl implements SelectOption { private List selectItems; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java index 8f7df3a22..5c6250aeb 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/EnumerationImpl.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.server.core.uri.queryoption.expression; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.queryoption.expression.Enumeration; import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor; +import java.util.ArrayList; +import java.util.List; + public class EnumerationImpl extends ExpressionImpl implements Enumeration { private EdmEnumType type; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java index 7104a9ff8..cd0090449 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/queryoption/expression/MethodImpl.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.queryoption.expression; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.server.api.ODataApplicationException; import org.apache.olingo.server.api.uri.queryoption.expression.Expression; import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitException; @@ -28,6 +25,9 @@ import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor import org.apache.olingo.server.api.uri.queryoption.expression.Method; import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; +import java.util.ArrayList; +import java.util.List; + public class MethodImpl extends ExpressionImpl implements Method { private MethodKind method; diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java index 32b72b3dd..f547c4875 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/validator/UriValidator.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.validator; -import java.util.HashMap; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -47,6 +44,9 @@ import org.apache.olingo.server.api.uri.UriResourceSingleton; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOption; import org.apache.olingo.server.api.uri.queryoption.SystemQueryOptionKind; +import java.util.HashMap; +import java.util.List; + public class UriValidator { //@formatter:off (Eclipse formatter) diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java index 74ea57c29..5ffb2fe2b 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/ContentNegotiatorTest.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.server.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.http.HttpHeader; @@ -48,6 +37,17 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class ContentNegotiatorTest { static final private String ACCEPT_CASE_MIN = "application/json;odata.metadata=minimal"; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java index faa82e321..9719a5216 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/ODataHttpHandlerImplTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import javax.servlet.http.HttpServletRequest; - import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.server.api.ODataRequest; @@ -32,6 +25,13 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.http.HttpServletRequest; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class ODataHttpHandlerImplTest { private final Logger LOG = LoggerFactory.getLogger(ODataHttpHandlerImplTest.class); diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java index cb1d8d30b..f48f05cb4 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImplTest.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmEntitySet; import org.apache.olingo.commons.api.edm.EdmException; @@ -44,6 +32,18 @@ import org.apache.olingo.server.api.edm.provider.ReturnType; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmActionImplTest { private EdmAction actionImpl1; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java index 08bdc3e6a..1b4f82c72 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmActionImportImplTest.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -35,6 +29,12 @@ import org.apache.olingo.server.api.edm.provider.ActionImport; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmActionImportImplTest { EdmEntityContainer container; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java index cc3586d0f..8a6623043 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImplTest.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmException; @@ -41,6 +30,17 @@ import org.apache.olingo.server.api.edm.provider.Property; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmComplexTypeImplTest { private EdmComplexType baseType; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java index 70291e702..088910699 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityContainerImplTest.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmActionImport; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -47,6 +36,17 @@ import org.apache.olingo.server.api.edm.provider.Singleton; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmEntityContainerImplTest { EdmEntityContainer container; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java index 4ac609545..539e48625 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntitySetImplTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.Arrays; - import org.apache.olingo.commons.api.edm.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntitySet; @@ -39,6 +32,13 @@ import org.apache.olingo.server.api.edm.provider.NavigationPropertyBinding; import org.apache.olingo.server.api.edm.provider.PropertyRef; import org.junit.Test; +import java.util.Arrays; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmEntitySetImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java index 91a601898..ddc9c2834 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImplTest.java @@ -18,17 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -46,6 +35,17 @@ import org.apache.olingo.server.api.edm.provider.PropertyRef; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmEntityTypeImplTest { private EdmEntityType baseType; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java index 9b5a5aee4..e95b24542 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmEnumTest.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -37,6 +27,16 @@ import org.apache.olingo.server.api.edm.provider.EnumMember; import org.apache.olingo.server.api.edm.provider.EnumType; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertArrayEquals; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + public class EdmEnumTest extends PrimitiveTypeBaseTest { private final EdmEnumType instance; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java index 50898470d..30a6394eb 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImplTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmReturnType; @@ -34,6 +27,13 @@ import org.apache.olingo.server.api.edm.provider.ReturnType; import org.junit.Before; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; + public class EdmFunctionImplTest { private EdmFunction functionImpl1; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java index db3698f99..a653ccb56 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmFunctionImportImplTest.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.Arrays; -import java.util.Collections; - import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmFunction; import org.apache.olingo.commons.api.edm.EdmFunctionImport; @@ -41,6 +32,15 @@ import org.apache.olingo.server.api.edm.provider.Parameter; import org.apache.olingo.server.api.edm.provider.ReturnType; import org.junit.Test; +import java.util.Arrays; +import java.util.Collections; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmFunctionImportImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java index e2950f3e3..2bb62e944 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmKeyPropertyRefImplTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.apache.olingo.commons.api.edm.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -34,6 +27,13 @@ import org.apache.olingo.commons.api.edm.EdmProperty; import org.apache.olingo.server.api.edm.provider.PropertyRef; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmKeyPropertyRefImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java index 98fddfbd2..210ffbb80 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmMemberImplTest.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.mockito.Mockito.mock; - import org.apache.olingo.server.api.edm.provider.EnumMember; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.mockito.Mockito.mock; + public class EdmMemberImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNamedImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNamedImplTest.java index 946d660a8..e5f364f36 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNamedImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNamedImplTest.java @@ -18,12 +18,12 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; - import org.apache.olingo.commons.api.edm.EdmNamed; import org.apache.olingo.commons.core.edm.EdmNamedImpl; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class EdmNamedImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java index be508c585..b0f6e7875 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmNavigationPropertyImplTest.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmNavigationProperty; import org.apache.olingo.commons.api.edm.EdmType; @@ -42,6 +30,18 @@ import org.apache.olingo.server.api.edm.provider.PropertyRef; import org.apache.olingo.server.api.edm.provider.ReferentialConstraint; import org.junit.Test; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmNavigationPropertyImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java index b0acc7dfa..b06c69385 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmParameterImplTest.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmParameter; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; @@ -38,6 +32,12 @@ import org.apache.olingo.server.api.edm.provider.Parameter; import org.apache.olingo.server.api.edm.provider.TypeDefinition; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmParameterImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java index d8a28dd4a..d21208403 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmPropertyImplTest.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmPrimitiveType; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; @@ -40,6 +32,14 @@ import org.apache.olingo.server.api.edm.provider.Property; import org.apache.olingo.server.api.edm.provider.TypeDefinition; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmPropertyImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java index 7e3642012..641769c3e 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplOverloadingTest.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNotSame; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmException; @@ -42,6 +30,18 @@ import org.apache.olingo.server.api.edm.provider.Parameter; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNotSame; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmProviderImplOverloadingTest { private Edm edm; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java index 2156077c4..d25d4c4ff 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmProviderImplTest.java @@ -18,18 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmComplexType; @@ -50,6 +38,18 @@ import org.apache.olingo.server.api.edm.provider.TypeDefinition; import org.junit.Before; import org.junit.Test; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmProviderImplTest { private Edm edm; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java index bc010df10..fb69f12d5 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmReturnTypeImplTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - import org.apache.olingo.commons.api.edm.EdmComplexType; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmEnumType; @@ -38,6 +31,13 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.server.api.edm.provider.ReturnType; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmReturnTypeImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java index c04211d24..647a6348a 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSchemaImplTest.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; @@ -61,6 +52,15 @@ import org.apache.olingo.server.api.edm.provider.TypeDefinition; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmSchemaImplTest { private EdmSchema schema; diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImplTest.java index b29836022..3d08d3508 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmServiceMetadataImplTest.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmEntitySetInfo; import org.apache.olingo.commons.api.edm.EdmException; @@ -41,6 +33,14 @@ import org.apache.olingo.server.api.edm.provider.Schema; import org.apache.olingo.server.api.edm.provider.Singleton; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; + public class EdmServiceMetadataImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java index 10717d5d0..4611d6ffc 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmSingletonImplTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.Arrays; - import org.apache.olingo.commons.api.edm.EdmBindingTarget; import org.apache.olingo.commons.api.edm.EdmEntityContainer; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -40,6 +33,13 @@ import org.apache.olingo.server.api.edm.provider.PropertyRef; import org.apache.olingo.server.api.edm.provider.Singleton; import org.junit.Test; +import java.util.Arrays; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class EdmSingletonImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java index f5a99edd3..5fc116c80 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeDefinitionImplTest.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; - import org.apache.olingo.commons.api.edm.EdmException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.EdmTypeDefinition; @@ -32,6 +27,11 @@ import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory; import org.apache.olingo.server.api.edm.provider.TypeDefinition; import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + public class EdmTypeDefinitionImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java index 3da16bd56..141ff320a 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/EdmTypeImplTest.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.core.edm.provider; -import static org.junit.Assert.assertEquals; - import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; import org.apache.olingo.commons.core.edm.EdmTypeImpl; import org.junit.Test; +import static org.junit.Assert.assertEquals; + public class EdmTypeImplTest { @Test diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/PrimitiveTypeBaseTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/PrimitiveTypeBaseTest.java index 721f3f297..3c58455f4 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/PrimitiveTypeBaseTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/edm/provider/PrimitiveTypeBaseTest.java @@ -18,13 +18,13 @@ ******************************************************************************/ package org.apache.olingo.server.core.edm.provider; +import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; + import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; - public abstract class PrimitiveTypeBaseTest { private void expectErrorInValueToString(final EdmPrimitiveType instance, diff --git a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializerTest.java b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializerTest.java index 3eb2c32bd..e159004cf 100644 --- a/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializerTest.java +++ b/lib/server-core/src/test/java/org/apache/olingo/server/core/serializer/json/ODataErrorSerializerTest.java @@ -18,13 +18,9 @@ */ package org.apache.olingo.server.core.serializer.json; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.JsonNodeType; import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.ODataRuntimeException; import org.apache.olingo.commons.api.domain.ODataError; @@ -35,9 +31,12 @@ import org.apache.olingo.server.api.serializer.ODataSerializer; import org.junit.Before; import org.junit.Test; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.JsonNodeType; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; public class ODataErrorSerializerTest { diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java index 1747e0467..7dcf7b789 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/TechnicalServlet.java @@ -18,14 +18,6 @@ */ package org.apache.olingo.server.tecsvc; -import java.io.IOException; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.server.api.OData; import org.apache.olingo.server.api.ODataHttpHandler; @@ -35,6 +27,13 @@ import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; + public class TechnicalServlet extends HttpServlet { private static final long serialVersionUID = 1L; diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java index d3c56780e..41e94f647 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/data/DataProvider.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.server.tecsvc.data; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Calendar; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.TimeZone; -import java.util.UUID; - import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; import org.apache.olingo.commons.api.data.LinkedComplexValue; @@ -45,6 +35,16 @@ import org.apache.olingo.commons.core.data.LinkedComplexValueImpl; import org.apache.olingo.commons.core.data.PropertyImpl; import org.apache.olingo.server.api.uri.UriParameter; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Calendar; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TimeZone; +import java.util.UUID; + public class DataProvider { private static final UUID GUID = UUID.fromString("01234567-89ab-cdef-0123-456789abcdef"); diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java index 2badfab44..7dfba9864 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/TechnicalProcessor.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.tecsvc.processor; -import java.net.URI; -import java.util.List; - import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; @@ -42,6 +39,9 @@ import org.apache.olingo.server.api.uri.UriResource; import org.apache.olingo.server.api.uri.UriResourceEntitySet; import org.apache.olingo.server.tecsvc.data.DataProvider; +import java.net.URI; +import java.util.List; + public class TechnicalProcessor implements CollectionProcessor, EntityProcessor { private OData odata; diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java index 0db486e96..83540b855 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ActionProvider.java @@ -18,15 +18,15 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.Arrays; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edm.provider.Action; import org.apache.olingo.server.api.edm.provider.Parameter; import org.apache.olingo.server.api.edm.provider.ReturnType; +import java.util.Arrays; +import java.util.List; + public class ActionProvider { // Bound Actions diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java index 09203383d..cac9f3235 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ComplexTypeProvider.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.Arrays; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edm.provider.ComplexType; import org.apache.olingo.server.api.edm.provider.NavigationProperty; import org.apache.olingo.server.api.edm.provider.Property; +import java.util.Arrays; + public class ComplexTypeProvider { public static final FullQualifiedName nameCTAllPrim = new FullQualifiedName(SchemaProvider.nameSpace, "CTAllPrim"); diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java index eed930bb2..e4390b403 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/ContainerProvider.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.commons.api.edm.Target; @@ -33,6 +29,10 @@ import org.apache.olingo.server.api.edm.provider.FunctionImport; import org.apache.olingo.server.api.edm.provider.NavigationPropertyBinding; import org.apache.olingo.server.api.edm.provider.Singleton; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class ContainerProvider { public static final FullQualifiedName nameContainer = new FullQualifiedName(SchemaProvider.nameSpace, "Container"); diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java index 1b14d8817..ca3ce3717 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EdmTechProvider.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.Arrays; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edm.provider.Action; @@ -40,6 +37,9 @@ import org.apache.olingo.server.api.edm.provider.Singleton; import org.apache.olingo.server.api.edm.provider.Term; import org.apache.olingo.server.api.edm.provider.TypeDefinition; +import java.util.Arrays; +import java.util.List; + public class EdmTechProvider extends EdmProvider { public static final String nameSpace = "com.sap.odata.test1"; diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java index 4763de855..1db1fa72d 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EntityTypeProvider.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.Arrays; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edm.provider.EntityType; @@ -28,6 +26,8 @@ import org.apache.olingo.server.api.edm.provider.Property; import org.apache.olingo.server.api.edm.provider.PropertyRef; import org.apache.olingo.server.api.edm.provider.ReferentialConstraint; +import java.util.Arrays; + public class EntityTypeProvider { public static final FullQualifiedName nameETAllKey = new FullQualifiedName(SchemaProvider.nameSpace, "ETAllKey"); diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java index 80f9bf383..0b3155752 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/EnumTypeProvider.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.Arrays; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edm.provider.EnumMember; import org.apache.olingo.server.api.edm.provider.EnumType; +import java.util.Arrays; + public class EnumTypeProvider { public static final FullQualifiedName nameENString = new FullQualifiedName(SchemaProvider.nameSpace, "ENString"); diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java index dc3a1f751..69b4345cc 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/FunctionProvider.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.edm.provider.Function; import org.apache.olingo.server.api.edm.provider.Parameter; import org.apache.olingo.server.api.edm.provider.ReturnType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class FunctionProvider { // Bound Functions diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java index 59f0f436d..d780173a2 100644 --- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java +++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/provider/SchemaProvider.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.tecsvc.provider; -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.server.api.edm.provider.Action; import org.apache.olingo.server.api.edm.provider.ComplexType; @@ -29,6 +26,9 @@ import org.apache.olingo.server.api.edm.provider.EnumType; import org.apache.olingo.server.api.edm.provider.Function; import org.apache.olingo.server.api.edm.provider.Schema; +import java.util.ArrayList; +import java.util.List; + public class SchemaProvider { private EdmTechProvider prov; diff --git a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/JsonDataProviderTest.java b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/JsonDataProviderTest.java index 37600f86e..2324dc094 100644 --- a/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/JsonDataProviderTest.java +++ b/lib/server-tecsvc/src/test/java/org/apache/olingo/server/tecsvc/data/JsonDataProviderTest.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.tecsvc.data; -import java.io.InputStream; -import java.util.List; - import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.Entity; import org.apache.olingo.commons.api.data.EntitySet; @@ -43,6 +40,9 @@ import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Assert; import org.junit.Test; +import java.io.InputStream; +import java.util.List; + /** */ public class JsonDataProviderTest { diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java index 6933d4c69..2566c3275 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/ODataHandlerTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; - -import java.util.Arrays; - import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; @@ -41,6 +34,13 @@ import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Before; import org.junit.Test; +import java.util.Arrays; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + public class ODataHandlerTest { private ODataHandler handler; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java index 3eaba5644..dc29a9365 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ODataJsonSerializerTest.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.serializer.json; -import java.io.InputStream; -import java.net.URI; - import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.data.ContextURL; import org.apache.olingo.commons.api.data.ContextURL.Suffix; @@ -38,6 +35,9 @@ import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Assert; import org.junit.Test; +import java.io.InputStream; +import java.net.URI; + public class ODataJsonSerializerTest { private final Edm edm = OData.newInstance().createEdm(new EdmTechProvider()); diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java index 969dd42c4..de0332798 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/json/ServiceDocumentTest.java @@ -18,16 +18,6 @@ */ package org.apache.olingo.server.core.serializer.json; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.io.InputStream; -import java.util.ArrayList; -import java.util.List; - import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityContainer; @@ -40,6 +30,16 @@ import org.apache.olingo.server.api.serializer.ODataSerializer; import org.junit.Before; import org.junit.Test; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + public class ServiceDocumentTest { private Edm edm; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java index ae3d053dd..e80457239 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/serializer/xml/MetadataDocumentTest.java @@ -18,15 +18,6 @@ */ package org.apache.olingo.server.core.serializer.xml; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; -import static org.mockito.Mockito.mock; - -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.commons.io.IOUtils; import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.ODataRuntimeException; @@ -60,6 +51,15 @@ import org.apache.olingo.server.core.edm.provider.EdmProviderImpl; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Test; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.mock; + public class MetadataDocumentTest { @Test(expected = ODataRuntimeException.class) diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/RawUriTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/RawUriTest.java index f54ad5799..bb3e891f7 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/RawUriTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/RawUriTest.java @@ -18,16 +18,16 @@ */ package org.apache.olingo.server.core.uri; -import static org.junit.Assert.assertEquals; +import org.apache.olingo.server.core.uri.parser.RawUri; +import org.apache.olingo.server.core.uri.parser.UriDecoder; +import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException; +import org.junit.Test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.olingo.server.core.uri.parser.RawUri; -import org.apache.olingo.server.core.uri.parser.UriDecoder; -import org.apache.olingo.server.core.uri.parser.UriParserSyntaxException; -import org.junit.Test; +import static org.junit.Assert.assertEquals; public class RawUriTest { diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java index a71762c41..d5adc7912 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriInfoImplTest.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.server.core.uri; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.server.api.uri.UriInfoAll; @@ -54,6 +48,12 @@ import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; import org.apache.olingo.server.tecsvc.provider.EntityTypeProvider; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class UriInfoImplTest { Edm edm = new EdmProviderImpl(new EdmTechTestProvider()); diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java index b1f16d7a6..9cb04fc7f 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java @@ -18,13 +18,6 @@ */ package org.apache.olingo.server.core.uri; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmActionImport; @@ -49,6 +42,13 @@ import org.apache.olingo.server.tecsvc.provider.ComplexTypeProvider; import org.apache.olingo.server.tecsvc.provider.EntityTypeProvider; import org.junit.Test; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class UriResourceImplTest { Edm edm = new EdmProviderImpl(new EdmTechTestProvider()); diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java index 47f118b8e..a6f33ec9c 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestFullResourcePath.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.antlr; -import java.io.UnsupportedEncodingException; -import java.util.Arrays; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.core.Encoder; import org.apache.olingo.server.api.ODataApplicationException; @@ -42,6 +39,9 @@ import org.apache.olingo.server.tecsvc.provider.PropertyProvider; import org.junit.Ignore; import org.junit.Test; +import java.io.UnsupportedEncodingException; +import java.util.Arrays; + public class TestFullResourcePath { Edm edm = null; TestUriValidator testUri = null; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java index 27b18fc92..299af4187 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/antlr/TestUriParserImpl.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.server.core.uri.antlr; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.Arrays; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.uri.UriInfoKind; @@ -39,6 +35,10 @@ import org.apache.olingo.server.tecsvc.provider.EntityTypeProvider; import org.apache.olingo.server.tecsvc.provider.PropertyProvider; import org.junit.Test; +import java.io.UnsupportedEncodingException; +import java.net.URLEncoder; +import java.util.Arrays; + public class TestUriParserImpl { Edm edm = null; private final String PropertyBoolean = "PropertyBoolean=true"; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java index 29abba77f..cde718f3c 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/QueryOptionTest.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.server.core.uri.queryoption; -import static org.junit.Assert.assertEquals; - -import java.util.ArrayList; -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.FullQualifiedName; import org.apache.olingo.server.api.uri.UriInfoResource; @@ -35,6 +30,11 @@ import org.apache.olingo.server.core.uri.queryoption.expression.LiteralImpl; import org.apache.olingo.server.core.uri.testutil.EdmTechTestProvider; import org.junit.Test; +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; + //TOOD add getKind check to all public class QueryOptionTest { diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java index 6f79060cf..81a192f93 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/queryoption/expression/ExpressionTest.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.server.core.uri.queryoption.expression; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -import java.util.Arrays; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmAction; import org.apache.olingo.commons.api.edm.EdmEntityType; @@ -47,6 +42,11 @@ import org.apache.olingo.server.tecsvc.provider.EnumTypeProvider; import org.apache.olingo.server.tecsvc.provider.FunctionProvider; import org.junit.Test; +import java.util.Arrays; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class ExpressionTest { Edm edm = new EdmProviderImpl(new EdmTechTestProvider()); diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java index 8f0d507d7..c0cb91968 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/EdmTechTestProvider.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import java.util.Arrays; -import java.util.List; - import org.apache.olingo.commons.api.ODataException; import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -31,6 +28,9 @@ import org.apache.olingo.server.api.edm.provider.Property; import org.apache.olingo.server.api.edm.provider.PropertyRef; import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; +import java.util.Arrays; +import java.util.List; + /** * Implement the EdmTechProvider and *
  • adds a entity type ETabc with properties a,b,c,d,e,f
    • diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java index 0d16c764c..82b5853f7 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -36,6 +33,9 @@ import org.apache.olingo.server.core.uri.queryoption.OrderByOptionImpl; import org.apache.olingo.server.core.uri.queryoption.QueryOptionImpl; import org.apache.olingo.server.core.uri.queryoption.SelectOptionImpl; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class ExpandValidator implements TestValidator { private Edm edm; private TestValidator invokedByValidator; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java index 6574ed70e..9664b7e40 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java @@ -18,8 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import java.util.List; - import org.apache.olingo.commons.api.edm.EdmEnumType; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.server.api.ODataApplicationException; @@ -36,6 +34,8 @@ import org.apache.olingo.server.api.uri.queryoption.expression.ExpressionVisitor import org.apache.olingo.server.api.uri.queryoption.expression.MethodKind; import org.apache.olingo.server.api.uri.queryoption.expression.UnaryOperatorKind; +import java.util.List; + public class FilterTreeToText implements ExpressionVisitor { public static String Serialize(final FilterOption filter) diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java index cd5c4f8cc..62463f511 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterValidator.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmType; import org.apache.olingo.commons.api.edm.FullQualifiedName; @@ -48,6 +43,11 @@ import org.apache.olingo.server.core.uri.queryoption.expression.MemberImpl; import org.apache.olingo.server.core.uri.queryoption.expression.MethodImpl; import org.apache.olingo.server.core.uri.queryoption.expression.TypeLiteralImpl; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class FilterValidator implements TestValidator { private Edm edm; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java index f6a308607..1859ea232 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java @@ -18,9 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import java.util.Arrays; -import java.util.List; - import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.misc.NotNull; import org.antlr.v4.runtime.misc.Nullable; @@ -30,6 +27,9 @@ import org.antlr.v4.runtime.tree.RuleNode; import org.antlr.v4.runtime.tree.TerminalNode; import org.antlr.v4.runtime.tree.Tree; +import java.util.Arrays; +import java.util.List; + public class ParseTreeToText { public static String getTreeAsText(final Tree contextTree, final String[] ruleNames) { diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParserValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParserValidator.java index 3f73b97f0..aeb130969 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParserValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParserValidator.java @@ -18,13 +18,13 @@ */ package org.apache.olingo.server.core.uri.testutil; -import static org.junit.Assert.assertEquals; +import org.antlr.v4.runtime.ParserRuleContext; +import org.apache.olingo.server.core.uri.antlr.UriParserParser; import java.util.ArrayList; import java.util.List; -import org.antlr.v4.runtime.ParserRuleContext; -import org.apache.olingo.server.core.uri.antlr.UriParserParser; +import static org.junit.Assert.assertEquals; public class ParserValidator { diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java index 871c70db9..4502ca613 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java @@ -18,12 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.fail; - -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmElement; import org.apache.olingo.commons.api.edm.EdmType; @@ -56,6 +50,12 @@ import org.apache.olingo.server.core.uri.queryoption.SelectOptionImpl; import org.apache.olingo.server.core.uri.queryoption.expression.ExpressionImpl; import org.apache.olingo.server.core.uri.validator.UriValidator; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.fail; + public class ResourceValidator implements TestValidator { private Edm edm; private TestValidator invokedBy; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestErrorLogger.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestErrorLogger.java index 0153036dc..fda6683a4 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestErrorLogger.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestErrorLogger.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import java.util.BitSet; -import java.util.Collections; -import java.util.List; - import org.antlr.v4.runtime.ANTLRErrorListener; import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.RecognitionException; @@ -30,6 +26,10 @@ import org.antlr.v4.runtime.atn.ATNConfigSet; import org.antlr.v4.runtime.dfa.DFA; import org.apache.olingo.server.core.uri.antlr.UriLexer; +import java.util.BitSet; +import java.util.Collections; +import java.util.List; + class TestErrorLogger implements ANTLRErrorListener { private String prefix; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java index 1f08440d2..022954b21 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TestUriValidator.java @@ -18,11 +18,6 @@ */ package org.apache.olingo.server.core.uri.testutil; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import java.util.List; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.edm.EdmEntityType; import org.apache.olingo.commons.api.edm.EdmType; @@ -43,6 +38,11 @@ import org.apache.olingo.server.core.uri.queryoption.SelectOptionImpl; import org.apache.olingo.server.core.uri.validator.UriValidationException; import org.apache.olingo.server.core.uri.validator.UriValidator; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; + public class TestUriValidator implements TestValidator { private Edm edm; diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TokenValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TokenValidator.java index 4a94bb3e7..4632eff40 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TokenValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/TokenValidator.java @@ -18,14 +18,14 @@ */ package org.apache.olingo.server.core.uri.testutil; -import static org.junit.Assert.assertEquals; - -import java.util.List; - import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.Token; import org.apache.olingo.server.core.uri.antlr.UriLexer; +import java.util.List; + +import static org.junit.Assert.assertEquals; + //TODO extend to test also exception which can occure while paring public class TokenValidator { diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java index f1bca61cd..cdb8bc985 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/validator/UriValidatorTest.java @@ -18,10 +18,6 @@ */ package org.apache.olingo.server.core.uri.validator; -import static org.junit.Assert.fail; - -import java.util.ArrayList; - import org.apache.olingo.commons.api.edm.Edm; import org.apache.olingo.commons.api.http.HttpMethod; import org.apache.olingo.server.api.uri.UriInfo; @@ -33,6 +29,10 @@ import org.apache.olingo.server.tecsvc.provider.EdmTechProvider; import org.junit.Before; import org.junit.Test; +import java.util.ArrayList; + +import static org.junit.Assert.fail; + public class UriValidatorTest { private static final String URI_ALL = "$all";