diff --git a/fit/src/it/demoV4/pom.xml b/fit/src/it/demo/pom.xml similarity index 100% rename from fit/src/it/demoV4/pom.xml rename to fit/src/it/demo/pom.xml diff --git a/fit/src/it/demoV4/verify.groovy b/fit/src/it/demo/verify.groovy similarity index 100% rename from fit/src/it/demoV4/verify.groovy rename to fit/src/it/demo/verify.groovy diff --git a/fit/src/it/openTypeV4/pom.xml b/fit/src/it/openType/pom.xml similarity index 100% rename from fit/src/it/openTypeV4/pom.xml rename to fit/src/it/openType/pom.xml diff --git a/fit/src/it/openTypeV4/verify.groovy b/fit/src/it/openType/verify.groovy similarity index 100% rename from fit/src/it/openTypeV4/verify.groovy rename to fit/src/it/openType/verify.groovy diff --git a/fit/src/it/staticServiceV4/pom.xml b/fit/src/it/staticService/pom.xml similarity index 100% rename from fit/src/it/staticServiceV4/pom.xml rename to fit/src/it/staticService/pom.xml diff --git a/fit/src/it/staticServiceV4/verify.groovy b/fit/src/it/staticService/verify.groovy similarity index 100% rename from fit/src/it/staticServiceV4/verify.groovy rename to fit/src/it/staticService/verify.groovy 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 8dae5c364..72a606153 100644 --- a/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java +++ b/fit/src/main/java/org/apache/olingo/fit/AbstractServices.java @@ -684,7 +684,7 @@ public abstract class AbstractServices { final String location; - if ((this instanceof V4KeyAsSegment)) { + if ((this instanceof KeyAsSegment)) { location = uriInfo.getRequestUri().toASCIIString() + "/" + entityKey; final Link editLink = new Link(); @@ -1223,7 +1223,7 @@ public abstract class AbstractServices { } final Entity entry = container.getPayload(); - if ((this instanceof V4KeyAsSegment)) { + if ((this instanceof KeyAsSegment)) { final Link editLink = new Link(); editLink.setRel("edit"); editLink.setTitle(entitySetName); diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java b/fit/src/main/java/org/apache/olingo/fit/Demo.java similarity index 98% rename from fit/src/main/java/org/apache/olingo/fit/V4Demo.java rename to fit/src/main/java/org/apache/olingo/fit/Demo.java index e723cde9f..c591f0115 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Demo.java +++ b/fit/src/main/java/org/apache/olingo/fit/Demo.java @@ -51,9 +51,9 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/Demo.svc") -public class V4Demo extends V4Services { +public class Demo extends Services { - public V4Demo() throws IOException { + public Demo() throws IOException { super(new Metadata(FSManager.instance(ODataServiceVersion.V40). readRes("demo" + StringUtils.capitalize(Constants.get(ConstantKey.METADATA)), Accept.XML))); } diff --git a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java b/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java similarity index 98% rename from fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java rename to fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java index dbb7ccae4..ef8ffa5d0 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4KeyAsSegment.java +++ b/fit/src/main/java/org/apache/olingo/fit/KeyAsSegment.java @@ -47,9 +47,9 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/KeyAsSegment.svc") -public class V4KeyAsSegment extends V4Services { +public class KeyAsSegment extends Services { - public V4KeyAsSegment() throws IOException { + public KeyAsSegment() throws IOException { super(); } diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java b/fit/src/main/java/org/apache/olingo/fit/NorthWind.java similarity index 94% rename from fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java rename to fit/src/main/java/org/apache/olingo/fit/NorthWind.java index 071e7176c..f5acaedc1 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWind.java +++ b/fit/src/main/java/org/apache/olingo/fit/NorthWind.java @@ -32,9 +32,9 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/NorthWind.svc") @InInterceptors(classes = XHTTPMethodInterceptor.class) -public class V4NorthWind extends V4Services { +public class NorthWind extends Services { - public V4NorthWind() throws IOException { + public NorthWind() throws IOException { super(); } diff --git a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java b/fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java similarity index 94% rename from fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java rename to fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java index fad9bda87..61e0df685 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4NorthWindExt.java +++ b/fit/src/main/java/org/apache/olingo/fit/NorthWindExt.java @@ -33,9 +33,9 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/NorthWindExt.svc") @InInterceptors(classes = { XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class }) -public class V4NorthWindExt extends V4Services { +public class NorthWindExt extends Services { - public V4NorthWindExt() throws IOException { + public NorthWindExt() throws IOException { super(); } diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java b/fit/src/main/java/org/apache/olingo/fit/OAuth2.java similarity index 92% rename from fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java rename to fit/src/main/java/org/apache/olingo/fit/OAuth2.java index a0ab3be24..9b2c9f1e6 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4OAuth2.java +++ b/fit/src/main/java/org/apache/olingo/fit/OAuth2.java @@ -26,9 +26,9 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/OAuth2.svc") -public class V4OAuth2 extends V4Services { +public class OAuth2 extends Services { - public V4OAuth2() throws IOException { + public OAuth2() throws IOException { super(); } diff --git a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java b/fit/src/main/java/org/apache/olingo/fit/OpenType.java similarity index 98% rename from fit/src/main/java/org/apache/olingo/fit/V4OpenType.java rename to fit/src/main/java/org/apache/olingo/fit/OpenType.java index ba902f539..e65c5bf8a 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4OpenType.java +++ b/fit/src/main/java/org/apache/olingo/fit/OpenType.java @@ -50,9 +50,9 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/OpenType.svc") -public class V4OpenType extends V4Services { +public class OpenType extends Services { - public V4OpenType() throws IOException { + public OpenType() throws IOException { super(new Metadata(FSManager.instance(ODataServiceVersion.V40). readRes("openType" + StringUtils.capitalize(Constants.get(ConstantKey.METADATA)), Accept.XML))); } diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Services.java b/fit/src/main/java/org/apache/olingo/fit/Services.java similarity index 99% rename from fit/src/main/java/org/apache/olingo/fit/V4Services.java rename to fit/src/main/java/org/apache/olingo/fit/Services.java index c3d8a7751..68e2c649a 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Services.java +++ b/fit/src/main/java/org/apache/olingo/fit/Services.java @@ -88,7 +88,7 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/Static.svc") @InInterceptors(classes = { XHTTPMethodInterceptor.class, ResolvingReferencesInterceptor.class }) -public class V4Services extends AbstractServices { +public class Services extends AbstractServices { /** * CR/LF. @@ -102,11 +102,11 @@ public class V4Services extends AbstractServices { private final Map providedAsync = new HashMap(); - public V4Services() throws IOException { + public Services() throws IOException { super(ODataServiceVersion.V40, Commons.getMetadata(ODataServiceVersion.V40)); } - protected V4Services(final Metadata metadata) throws IOException { + protected Services(final Metadata metadata) throws IOException { super(ODataServiceVersion.V40, metadata); } diff --git a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java b/fit/src/main/java/org/apache/olingo/fit/Vocabularies.java similarity index 90% rename from fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java rename to fit/src/main/java/org/apache/olingo/fit/Vocabularies.java index 099c8ab8c..0390eae33 100644 --- a/fit/src/main/java/org/apache/olingo/fit/V4Vocabularies.java +++ b/fit/src/main/java/org/apache/olingo/fit/Vocabularies.java @@ -38,15 +38,13 @@ import org.springframework.stereotype.Service; @Service @Path("/V40/Vocabularies.svc") -public class V4Vocabularies { - - private final Metadata metadata; +public class Vocabularies { private final XMLUtilities xml; - public V4Vocabularies() throws IOException { - metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readRes( - "vocabularies-" + Constants.get(ConstantKey.METADATA), Accept.XML)); + public Vocabularies() throws IOException { + Metadata metadata = new Metadata(FSManager.instance(ODataServiceVersion.V40).readRes( + "vocabularies-" + Constants.get(ConstantKey.METADATA), Accept.XML)); xml = new XMLUtilities(metadata); } diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/AbstractTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/AbstractTestITCase.java index 78413bf85..1f85633c1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/AbstractTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.startsWith; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java index a5d732945..1f2cc23b4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/AsyncTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/AuthBatchTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/AuthBatchTestITCase.java index 81050a47b..91038187e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/AuthBatchTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/BatchTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/BatchTestITCase.java index 793f06f89..2e77a08cd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/BatchTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/BoundOperationInvokeTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/BoundOperationInvokeTestITCase.java index 9782ff0d8..ecd15c7dd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/BoundOperationInvokeTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/ConformanceTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/ConformanceTestITCase.java index 32ce4351d..d682e64ac 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/ConformanceTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/DeltaTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/DeltaTestITCase.java index dc2c24663..6c7bfc608 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/DeltaTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/DerivedTypeTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/DerivedTypeTestITCase.java index 47e71e0d7..2f470c320 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/DerivedTypeTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/EntityCreateTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/EntityCreateTestITCase.java index 781396663..868c15464 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/EntityCreateTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/EntityRetrieveTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/EntityRetrieveTestITCase.java index 53f8492bd..2137dfb2b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/EntityRetrieveTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/EntitySetTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/EntitySetTestITCase.java index 64d425b04..f3e784a04 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/EntitySetTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/EntityUpdateTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/EntityUpdateTestITCase.java index 875034895..aa2bc0685 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/EntityUpdateTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/ErrorResponseTestITCase.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/ErrorResponseTestITCase.java index b241ef60b..d386bbed3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ErrorResponseTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/ErrorResponseTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/FilterFactoryTestITCase.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/FilterFactoryTestITCase.java index f25cfd3b7..ccf97a089 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/FilterFactoryTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/JSONFormatConformanceTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/JSONFormatConformanceTestITCase.java index f738ed47a..4f8a7790a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/JSONFormatConformanceTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/JSONFormatConformanceTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/KeyAsSegmentTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/KeyAsSegmentTestITCase.java index 54206fb51..3670292c0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/KeyAsSegmentTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/MediaEntityTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/MediaEntityTestITCase.java index fe4120696..84de7eba7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/MediaEntityTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java index 099368282..62906c8ab 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/MetadataTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/MetadataTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/OAuth2TestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/OAuth2TestITCase.java index 1ca5f423d..e5f2542d9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/OAuth2TestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/OpenTypeTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/OpenTypeTestITCase.java index c3b033704..e5f213b43 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/OpenTypeTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/OperationImportInvokeTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/OperationImportInvokeTestITCase.java index d6d535bae..f083365ed 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/OperationImportInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/OperationImportInvokeTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/PropertyTestITCase.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/PropertyTestITCase.java index cb94f83fe..e16d9ea81 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/PropertyTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -129,7 +129,8 @@ public class PropertyTestITCase extends AbstractTestITCase { complex(client, ContentType.JSON_FULL_METADATA); } - private void updateComplexProperty(final ContentType contentType, final UpdateType type) throws IOException { + private void updateComplexProperty(final ContentType contentType, final UpdateType type) + throws IOException { final URIBuilder uriBuilder = client.newURIBuilder(testStaticServiceRootURL). appendEntitySetSegment("Customers").appendKeySegment(1).appendPropertySegment("HomeAddress"); @@ -139,12 +140,14 @@ public class PropertyTestITCase extends AbstractTestITCase { ODataRetrieveResponse retrieveRes = retrieveReq.execute(); assertEquals(200, retrieveRes.getStatusCode()); + ClientProperty oldAddress = retrieveRes.getBody(); ClientProperty homeAddress = client.getObjectFactory().newComplexProperty("HomeAddress", client.getObjectFactory().newComplexValue(retrieveRes.getBody().getComplexValue().getTypeName())); + final String cityName = "Pescara"; homeAddress.getComplexValue().add(client.getObjectFactory(). - newPrimitiveProperty("City", client.getObjectFactory().newPrimitiveValueBuilder().buildString("Pescara"))); + newPrimitiveProperty("City", client.getObjectFactory().newPrimitiveValueBuilder().buildString(cityName))); final ODataPropertyUpdateRequest updateReq = client.getCUDRequestFactory(). getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, homeAddress); @@ -165,7 +168,12 @@ public class PropertyTestITCase extends AbstractTestITCase { assertEquals(200, retrieveRes.getStatusCode()); homeAddress = retrieveRes.getBody(); - assertEquals("Pescara", homeAddress.getComplexValue().get("City").getPrimitiveValue().toString()); + assertEquals(cityName, homeAddress.getComplexValue().get("City").getPrimitiveValue().toString()); + + // + final ODataPropertyUpdateRequest resetRequest = client.getCUDRequestFactory(). + getPropertyComplexValueUpdateRequest(uriBuilder.build(), type, oldAddress); + assertEquals(204, resetRequest.execute().getStatusCode()); } @Test diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/PropertyValueTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/PropertyValueTestITCase.java index c2eadc231..12bc82796 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/PropertyValueTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java index b9119f8b7..cd937ab59 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/QueryOptionsTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -75,7 +75,7 @@ public class QueryOptionsTestITCase extends AbstractTestITCase { /** * Test $filter and $orderby. * - * @see org.apache.olingo.fit.v4.FilterFactoryTestITCase for more tests. + * @see org.apache.olingo.fit.base.FilterFactoryTestITCase for more tests. */ @Test public void filterOrderby() throws EdmPrimitiveTypeException { diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/ServiceDocumentTestITCase.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/ServiceDocumentTestITCase.java index 69a869c3b..10beb8bc3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/ServiceDocumentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/ServiceDocumentTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; diff --git a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/base/SingletonTestITCase.java similarity index 99% rename from fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/base/SingletonTestITCase.java index 7f4e2f8d2..8a0ee72bd 100644 --- a/fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/base/SingletonTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.v4; +package org.apache.olingo.fit.base; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; 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/APIBasicDesignTestITCase.java similarity index 87% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java index 260d35b9b..a66192ba5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/APIBasicDesignTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -41,27 +41,31 @@ import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.EdmStreamValue; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; import org.apache.olingo.ext.proxy.commons.AbstractCollectionInvocationHandler; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail; -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.AddressCollection; -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.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.HomeAddress; -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.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.PersonComposableInvoker; -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.ProductCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollectionComposableInvoker; -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; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.demo.Service; +import org.apache.olingo.fit.proxy.demo.odatademo.DemoService; +import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductDetailCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection; + // CHECKSTYLE:ON (Maven checkstyle) import org.junit.Test; @@ -199,7 +203,7 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase { @Test public void loadWithSelect() { - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order order = + Order order = getContainer().getOrders().getByKey(8); assertNull(order.getOrderID()); assertNull(order.getOrderDate()); @@ -324,8 +328,8 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase { // --------------------------------------- // Instantiate Demo Service // --------------------------------------- - final org.apache.olingo.fit.proxy.v4.demo.Service dservice = - org.apache.olingo.fit.proxy.v4.demo.Service.getV4(testDemoServiceRootURL); + final Service dservice = + Service.getV4(testDemoServiceRootURL); dservice.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM); final DemoService dcontainer = dservice.getEntityContainer(DemoService.class); assertNotNull(dcontainer); @@ -354,8 +358,8 @@ public class APIBasicDesignTestITCase extends AbstractTestITCase { // --------------------------------------- // Instantiate Demo Service // --------------------------------------- - final org.apache.olingo.fit.proxy.v4.demo.Service dservice = - org.apache.olingo.fit.proxy.v4.demo.Service.getV4(testDemoServiceRootURL); + final Service dservice = + Service.getV4(testDemoServiceRootURL); dservice.getClient().getConfiguration().setDefaultBatchAcceptFormat(ContentType.APPLICATION_OCTET_STREAM); final DemoService dcontainer = dservice.getEntityContainer(DemoService.class); assertNotNull(dcontainer); 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/AbstractTestITCase.java similarity index 92% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java index 7ef9511af..c6e1b2cd0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AbstractTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -35,10 +35,10 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; import org.apache.olingo.fit.AbstractBaseTestITCase; -import org.apache.olingo.fit.proxy.v4.staticservice.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.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; import org.junit.BeforeClass; public abstract class AbstractTestITCase extends AbstractBaseTestITCase { 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/AsyncTestITCase.java similarity index 80% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java index b0c1c0332..6d4fe7fee 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AsyncTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AsyncTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -27,12 +27,14 @@ import java.util.concurrent.Future; import org.apache.commons.lang3.RandomStringUtils; // 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; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PersonComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; // CHECKSTYLE:ON (Maven checkstyle) import org.junit.Test; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java index c6b9a6726..2a5462218 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityCreateTestITCase.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.staticservice.Service; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; public class AuthEntityCreateTestITCase extends EntityCreateTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java similarity index 87% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java index 1a359bb17..471c01bc5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/AuthEntityRetrieveTestITCase.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.staticservice.Service; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; public class AuthEntityRetrieveTestITCase extends EntityRetrieveTestITCase { 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/BoundOperationInvokeTestITCase.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java index 6829d38a2..5847f4785 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/BoundOperationInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/BoundOperationInvokeTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; // CHECKSTYLE:OFF (Maven checkstyle) import static org.junit.Assert.assertEquals; @@ -25,16 +25,18 @@ import static org.junit.Assert.assertNotNull; import java.sql.Timestamp; import java.util.Calendar; -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.AccountInfoComposableInvoker; -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.AddressCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; -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.ProductComposableInvoker; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollectionComposableInvoker; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductDetailCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductComposableInvoker; + import org.junit.Test; // CHECKSTYLE:ON (Maven checkstyle) diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java similarity index 86% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java index 344492e4a..2d970385e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/ContextTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,11 +30,11 @@ import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.api.ODataFlushException; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; -import org.apache.olingo.fit.proxy.v4.staticservice.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.Address; -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.Person; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.junit.Test; public class ContextTestITCase extends AbstractTestITCase { 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/DerivedTypeTestITCase.java similarity index 77% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java index 2cccc6810..f59dcd856 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/DerivedTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/DerivedTypeTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -26,13 +26,14 @@ import java.sql.Timestamp; import java.util.Calendar; // 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; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPICollection; + +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; // CHECKSTYLE:ON (Maven checkstyle) import org.junit.Test; 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/EntityCreateTestITCase.java similarity index 80% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java index d6149fa70..e58111133 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityCreateTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; // CHECKSTYLE:OFF (Maven checkstyle) import static org.junit.Assert.assertEquals; @@ -34,22 +34,24 @@ import org.apache.commons.lang3.RandomUtils; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; -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.Color; -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.Employee; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; -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.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; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrumentCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection; + +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; +import org.junit.Assert; import org.junit.Test; // CHECKSTYLE:ON (Maven checkstyle) @@ -106,13 +108,13 @@ public class EntityCreateTestITCase extends AbstractTestITCase { Employee actual = getContainer().getPeople().getByKey(id, Employee.class).load(); assertNotNull(actual); assertEquals(id, actual.getPersonID()); - assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); + Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); getService().getContext().detachAll(); actual = getContainer().getPeople().getByKey(id, Employee.class).load(); assertNotNull(actual); assertEquals(id, actual.getPersonID()); - assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); + Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); getContainer().getPeople().delete(actual.getPersonID()); getContainer().flush(); @@ -167,9 +169,9 @@ public class EntityCreateTestITCase extends AbstractTestITCase { getContainer().flush(); Customer actual = readCustomer(getContainer(), id); - assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); - assertEquals(1, actual.getOrders().execute().size()); - assertEquals(8, actual.getOrders().iterator().next().getOrderID(), 0); + Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); + Assert.assertEquals(1, actual.getOrders().execute().size()); + Assert.assertEquals(8, actual.getOrders().iterator().next().getOrderID(), 0); getContainer().getCustomers().delete(actual.getPersonID()); getContainer().flush(); @@ -248,13 +250,13 @@ public class EntityCreateTestITCase extends AbstractTestITCase { assertEquals(id, customer.getPersonID()); Customer actual = readCustomer(getContainer(), id); - assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); - assertEquals(1, actual.getOrders().execute().size()); - assertEquals(id, actual.getOrders().iterator().next().getOrderID()); + Assert.assertEquals(homeAddress.getCity(), actual.getHomeAddress().getCity()); + Assert.assertEquals(1, actual.getOrders().execute().size()); + Assert.assertEquals(id, actual.getOrders().iterator().next().getOrderID()); order = getContainer().getOrders().getByKey(id); assertNotNull(order); - assertEquals(id, order.getCustomerForOrder().load().getPersonID()); + Assert.assertEquals(id, order.getCustomerForOrder().load().getPersonID()); getContainer().getOrders().delete(actual.getOrders()); getContainer().flush(); @@ -346,7 +348,7 @@ public class EntityCreateTestITCase extends AbstractTestITCase { product = getContainer().getProducts().getByKey(12).load(); assertEquals("Latte", product.getName()); - assertEquals(12, product.getDetails().execute().iterator().next().getProductDetailID(), 0); + Assert.assertEquals(12, product.getDetails().execute().iterator().next().getProductDetailID(), 0); } @Test 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/EntityRetrieveTestITCase.java similarity index 72% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java index 7ee31b82c..3b74db88f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityRetrieveTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityRetrieveTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -32,22 +32,22 @@ import java.util.TimeZone; import org.apache.commons.lang3.StringUtils; import org.apache.olingo.ext.proxy.commons.EntityInvocationHandler; // 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; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; // CHECKSTYLE:ON (Maven checkstyle) import org.junit.Test; 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/EntitySetTestITCase.java similarity index 84% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java index 37c2d0ca2..7610603cb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntitySetTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntitySetTestITCase.java @@ -16,13 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; 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.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.junit.Assert; import org.junit.Test; /** @@ -33,7 +34,7 @@ public class EntitySetTestITCase extends AbstractTestITCase { @Test public void count() { assertNotNull(container.getOrders()); - assertEquals(2, container.getOrders().count().longValue()); + Assert.assertEquals(2, container.getOrders().count().longValue()); } @Test 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/EntityUpdateTestITCase.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java index ab3f075fe..fce3d8592 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/EntityUpdateTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; // CHECKSTYLE:OFF (Maven checkstyle) import static org.junit.Assert.assertEquals; @@ -35,16 +35,16 @@ import org.apache.commons.lang3.StringUtils; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.ext.proxy.AbstractService; 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.CompanyAddress; -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.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.junit.Test; // CHECKSTYLE:ON (Maven checkstyle) 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/FilterTestITCase.java similarity index 84% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java index 72e364335..d9f3c9d4e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/FilterTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/FilterTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,11 +29,11 @@ import java.util.List; import org.apache.olingo.ext.proxy.api.Search; import org.apache.olingo.ext.proxy.api.Sort; // CHECKSTYLE:OFF (Maven checkstyle) -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.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.Person; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.People; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; import org.junit.Test; // CHECKSTYLE:ON (Maven checkstyle) 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/KeyAsSegmentTestITCase.java similarity index 86% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java index ac450de41..bc5752927 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/KeyAsSegmentTestITCase.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.staticservice.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.Person; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.junit.Test; public class KeyAsSegmentTestITCase extends AbstractTestITCase { 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/MediaEntityTestITCase.java similarity index 94% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/MediaEntityTestITCase.java index 752fba5b8..f2cb7fba3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/MediaEntityTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -33,9 +33,9 @@ import org.apache.commons.lang3.RandomStringUtils; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.api.EdmStreamValue; -import org.apache.olingo.fit.proxy.v4.demo.Service; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement; +import org.apache.olingo.fit.proxy.demo.Service; +import org.apache.olingo.fit.proxy.demo.odatademo.DemoService; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Advertisement; import org.junit.Test; /** diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java index c96df8425..60c4c125e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalAuthEntityCreateTestITCase.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.staticservice.Service; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; public class NonTransactionalAuthEntityCreateTestITCase extends EntityCreateTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java similarity index 87% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java index 3a91b4c1c..9b797ce9d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityCreateTestITCase.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.staticservice.Service; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; public class NonTransactionalEntityCreateTestITCase extends EntityCreateTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java similarity index 87% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java index cee126b34..0ed093c12 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalEntityUpdateTestITCase.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.staticservice.Service; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; public class NonTransactionalEntityUpdateTestITCase extends EntityUpdateTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalMediaEntityTestITCase.java similarity index 90% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalMediaEntityTestITCase.java index df7fee88c..e0b2bd315 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/NonTransactionalMediaEntityTestITCase.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.demo.Service; -import org.apache.olingo.fit.proxy.v4.demo.odatademo.DemoService; +import org.apache.olingo.fit.proxy.demo.Service; +import org.apache.olingo.fit.proxy.demo.odatademo.DemoService; public class NonTransactionalMediaEntityTestITCase extends MediaEntityTestITCase { 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/OpenTypeTestITCase.java similarity index 87% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java index 0defe4d00..42626b590 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -33,14 +33,14 @@ import java.util.UUID; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.ext.proxy.api.annotations.EntityType; -import org.apache.olingo.fit.proxy.v4.opentype.Service; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.DefaultContainer; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.AccountInfo; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Color; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.ContactDetails; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row; -import org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex; +import org.apache.olingo.fit.proxy.opentype.Service; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.DefaultContainer; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.AccountInfo; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Color; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex; import org.junit.BeforeClass; import org.junit.Test; 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/OperationImportInvokeTestITCase.java similarity index 79% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java index 723d31c70..e30ffb688 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/OperationImportInvokeTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/OperationImportInvokeTestITCase.java @@ -16,20 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; -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.staticservice.microsoft.test.odata.services.odatawcfservice.types + .PersonComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color; // CHECKSTYLE:OFF (Maven checkstyle) -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; // CHECKSTYLE:ON (Maven checkstyle) +import org.junit.Assert; import org.junit.Test; public class OperationImportInvokeTestITCase extends AbstractTestITCase { @@ -60,7 +63,7 @@ public class OperationImportInvokeTestITCase extends AbstractTestITCase { @Test public void getAllProducts() { final ProductCollectionComposableInvoker products = container.operations().getAllProducts(); - assertEquals(5, products.execute().size()); + Assert.assertEquals(5, products.execute().size()); } @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/PropertyTestITCase.java similarity index 86% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java index 8231bfe43..015161afb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/PropertyTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/PropertyTestITCase.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; import org.apache.olingo.ext.proxy.api.ODataFlushException; -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.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI; import org.junit.Test; /** 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/SingletonTestITCase.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java index 9f62618fa..fab7a14a0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/SingletonTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/SingletonTestITCase.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; 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; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; import org.junit.Test; public class SingletonTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java index 5a46da8f7..93906ef39 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/UnauthorizedEntityCreateTestITCase.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4; +package org.apache.olingo.fit.proxy; import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.client.api.http.HttpClientException; import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory; import org.apache.olingo.commons.api.format.ContentType; -import org.apache.olingo.fit.proxy.v4.staticservice.Service; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; +import org.apache.olingo.fit.proxy.staticservice.Service; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.InMemoryEntities; import org.junit.Test; public class UnauthorizedEntityCreateTestITCase extends AbstractTestITCase { diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/Service.java similarity index 85% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/Service.java index f66881dec..4cbc29f5b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/Service.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo; +package org.apache.olingo.fit.proxy.demo; import java.util.HashMap; import java.util.Map; @@ -26,6 +26,17 @@ import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.AbstractTerm; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Address; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Advertisement; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Category; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Customer; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Employee; +import org.apache.olingo.fit.proxy.demo.odatademo.types.FeaturedProduct; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Person; +import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetail; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Product; +import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductDetail; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Supplier; public class Service extends AbstractService { @@ -89,18 +100,18 @@ public class Service extends AbstractService super(compressedMetadata, metadataETag, version, serviceRoot, transactional); // CHECKSTYLE:OFF (Maven checkstyle) - entityTypes.put("ODataDemo.Customer", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Customer.class); - entityTypes.put("ODataDemo.PersonDetail", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail.class); - entityTypes.put("ODataDemo.ProductDetail", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail.class); - entityTypes.put("ODataDemo.Employee", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Employee.class); - entityTypes.put("ODataDemo.Product", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.class); - entityTypes.put("ODataDemo.Advertisement", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement.class); - entityTypes.put("ODataDemo.Category", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Category.class); - entityTypes.put("ODataDemo.Person", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.class); - entityTypes.put("ODataDemo.Supplier", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier.class); + entityTypes.put("ODataDemo.Customer", Customer.class); + entityTypes.put("ODataDemo.PersonDetail", PersonDetail.class); + entityTypes.put("ODataDemo.ProductDetail", ProductDetail.class); + entityTypes.put("ODataDemo.Employee", Employee.class); + entityTypes.put("ODataDemo.Product", Product.class); + entityTypes.put("ODataDemo.Advertisement", Advertisement.class); + entityTypes.put("ODataDemo.Category", Category.class); + entityTypes.put("ODataDemo.Person", Person.class); + entityTypes.put("ODataDemo.Supplier", Supplier.class); entityTypes.put("ODataDemo.FeaturedProduct", - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct.class); - complexTypes.put("ODataDemo.Address", org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address.class); + FeaturedProduct.class); + complexTypes.put("ODataDemo.Address", Address.class); // CHECKSTYLE:ON (Maven checkstyle) } 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/demo/odatademo/Advertisements.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Advertisements.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Advertisements.java index e103a3f9c..a1e9a943c 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/demo/odatademo/Advertisements.java @@ -16,19 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Advertisement; +import org.apache.olingo.fit.proxy.demo.odatademo.types.AdvertisementCollection; // CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Advertisements", container = "ODataDemo.DemoService") public interface Advertisements extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/demo/odatademo/Categories.java similarity index 76% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Categories.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Categories.java index f195389db..9aeb01216 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/demo/odatademo/Categories.java @@ -16,19 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Category; +import org.apache.olingo.fit.proxy.demo.odatademo.types.CategoryCollection; // CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Categories", container = "ODataDemo.DemoService") public interface Categories extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/demo/odatademo/DemoService.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/DemoService.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/DemoService.java index 3caa568ad..689a15eba 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/demo/odatademo/DemoService.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import java.io.InputStream; 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/demo/odatademo/PersonDetails.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/PersonDetails.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/PersonDetails.java index c0946c032..7bbe19ae6 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/demo/odatademo/PersonDetails.java @@ -16,19 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetail; +import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonDetailCollection; // CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "PersonDetails", container = "ODataDemo.DemoService") public interface PersonDetails extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/demo/odatademo/Persons.java similarity index 76% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Persons.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Persons.java index e1586b61b..016828241 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/demo/odatademo/Persons.java @@ -16,19 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Person; +import org.apache.olingo.fit.proxy.demo.odatademo.types.PersonCollection; // CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Persons", container = "ODataDemo.DemoService") public interface Persons extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/demo/odatademo/ProductDetails.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/ProductDetails.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/ProductDetails.java index 79bce3a0a..af9d06f0e 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/demo/odatademo/ProductDetails.java @@ -16,19 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductDetail; +import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductDetailCollection; // CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ProductDetails", container = "ODataDemo.DemoService") public interface ProductDetails extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/demo/odatademo/Products.java similarity index 76% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Products.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Products.java index 4daf4ddfe..ace5f49af 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/demo/odatademo/Products.java @@ -16,19 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Product; +import org.apache.olingo.fit.proxy.demo.odatademo.types.ProductCollection; // CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Products", container = "ODataDemo.DemoService") public interface Products extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/demo/odatademo/Suppliers.java similarity index 76% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/Suppliers.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/Suppliers.java index 6e2ee4462..3293d39e5 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/demo/odatademo/Suppliers.java @@ -16,19 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.demo.odatademo.types.Supplier; +import org.apache.olingo.fit.proxy.demo.odatademo.types.SupplierCollection; // CHECKSTYLE:ON (Maven checkstyle) @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Suppliers", container = "ODataDemo.DemoService") public interface Suppliers extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/package-info.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/package-info.java index 259416f27..c9f809496 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/package-info.java @@ -16,5 +16,5 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo; +package org.apache.olingo.fit.proxy.demo.odatademo; 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/demo/odatademo/types/Address.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Address.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Address.java index 24ac91e82..1310bf325 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/demo/odatademo/types/Address.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.Annotatable; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollection.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollection.java index 669a86ca7..85bf84e33 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollection.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface AddressCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.ComplexCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.ComplexCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollectionComposableInvoker.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollectionComposableInvoker.java index 98b0741c7..34e8a6796 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface AddressCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override AddressCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressComposableInvoker.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressComposableInvoker.java index 5a142e4ad..bc22a11c8 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AddressComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AddressComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/demo/odatademo/types/Advertisement.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Advertisement.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Advertisement.java index ee6a8ac9e..df7a8e0fb 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/demo/odatademo/types/Advertisement.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -85,9 +85,9 @@ public interface Advertisement targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct(); + FeaturedProduct getFeaturedProduct(); - void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct); + void setFeaturedProduct(FeaturedProduct _featuredProduct); void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream); 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/demo/odatademo/types/AdvertisementCollection.java similarity index 73% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementCollection.java index ae63639fe..12daaeb8d 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/demo/odatademo/types/AdvertisementCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface AdvertisementCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java similarity index 82% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java index 184d5b8f4..cba307e5f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface AdvertisementCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override AdvertisementCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementComposableInvoker.java similarity index 91% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementComposableInvoker.java index 6c7cd86f6..7137eaec5 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/AdvertisementComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/AdvertisementComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -85,9 +85,9 @@ public interface AdvertisementComposableInvoker targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct getFeaturedProduct(); + FeaturedProduct getFeaturedProduct(); - void setFeaturedProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.FeaturedProduct _featuredProduct); + void setFeaturedProduct(FeaturedProduct _featuredProduct); void uploadStream(org.apache.olingo.ext.proxy.api.EdmStreamValue stream); 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/demo/odatademo/types/Category.java similarity index 92% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Category.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Category.java index b854543c2..4283f833f 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/demo/odatademo/types/Category.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; @@ -70,9 +70,9 @@ public interface Category targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); + ProductCollection getProducts(); - void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); + void setProducts(ProductCollection _products); Operations operations(); 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/demo/odatademo/types/CategoryCollection.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryCollection.java index e915d362a..0c93867d8 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/demo/odatademo/types/CategoryCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface CategoryCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryCollectionComposableInvoker.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryCollectionComposableInvoker.java index 11abe7806..d5680f8d1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface CategoryCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override CategoryCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryComposableInvoker.java similarity index 90% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryComposableInvoker.java index ae60a2798..4964587d9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CategoryComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CategoryComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; @@ -71,8 +71,8 @@ public interface CategoryComposableInvoker targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); + ProductCollection getProducts(); - void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); + void setProducts(ProductCollection _products); } 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/demo/odatademo/types/Customer.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Customer.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Customer.java index 48369c370..405ce0a35 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/demo/odatademo/types/Customer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "ODataDemo.Person") public interface Customer extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person { + Person { @Override Customer load(); @@ -106,22 +106,22 @@ public interface Customer targetContainer = "DemoService", targetEntitySet = "PersonDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail(); + PersonDetail getPersonDetail(); @Override - void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail); + void setPersonDetail(PersonDetail _personDetail); @Override Operations operations(); - interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Operations { + interface Operations extends Person.Operations { // No additional methods needed for now. } @Override Annotations annotations(); - interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations { + interface Annotations extends Person.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID", 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/demo/odatademo/types/CustomerCollection.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerCollection.java index 6d21b38f1..6ce29da97 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/demo/odatademo/types/CustomerCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface CustomerCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerCollectionComposableInvoker.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerCollectionComposableInvoker.java index 34eb06b99..537ee8a59 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface CustomerCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override CustomerCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerComposableInvoker.java similarity index 91% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerComposableInvoker.java index f1fa92bde..4e6e7e2f0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/CustomerComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/CustomerComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -85,8 +85,8 @@ public interface CustomerComposableInvoker targetContainer = "DemoService", targetEntitySet = "PersonDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail(); + PersonDetail getPersonDetail(); - void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail); + void setPersonDetail(PersonDetail _personDetail); } 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/demo/odatademo/types/Employee.java similarity index 90% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Employee.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Employee.java index 15776d0ae..4b55f5372 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/demo/odatademo/types/Employee.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "ODataDemo.Person") public interface Employee extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person { + Person { @Override Employee load(); @@ -136,22 +136,22 @@ public interface Employee targetContainer = "DemoService", targetEntitySet = "PersonDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail(); + PersonDetail getPersonDetail(); @Override - void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail); + void setPersonDetail(PersonDetail _personDetail); @Override Operations operations(); - interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Operations { + interface Operations extends Person.Operations { // No additional methods needed for now. } @Override Annotations annotations(); - interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person.Annotations { + interface Annotations extends Person.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID", 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/demo/odatademo/types/EmployeeCollection.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeCollection.java index 53881210d..c3d8c0d66 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/demo/odatademo/types/EmployeeCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface EmployeeCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeCollectionComposableInvoker.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeCollectionComposableInvoker.java index eebb12284..d4918870f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface EmployeeCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override EmployeeCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeComposableInvoker.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeComposableInvoker.java index 8bef4fb48..64639cd78 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/EmployeeComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/EmployeeComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -115,8 +115,8 @@ public interface EmployeeComposableInvoker targetContainer = "DemoService", targetEntitySet = "PersonDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail(); + PersonDetail getPersonDetail(); - void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail); + void setPersonDetail(PersonDetail _personDetail); } 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/demo/odatademo/types/FeaturedProduct.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProduct.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProduct.java index c2fe2e8d8..0d09511bd 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/demo/odatademo/types/FeaturedProduct.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "ODataDemo.Product") public interface FeaturedProduct extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product { + Product { @Override FeaturedProduct load(); @@ -176,10 +176,10 @@ public interface FeaturedProduct targetContainer = "DemoService", targetEntitySet = "Categories", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories(); + CategoryCollection getCategories(); @Override - void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories); + void setCategories(CategoryCollection _categories); @Override @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier", @@ -188,10 +188,10 @@ public interface FeaturedProduct targetContainer = "DemoService", targetEntitySet = "Suppliers", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier(); + Supplier getSupplier(); @Override - void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier); + void setSupplier(Supplier _supplier); @Override @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail", @@ -200,10 +200,10 @@ public interface FeaturedProduct targetContainer = "DemoService", targetEntitySet = "ProductDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail(); + ProductDetail getProductDetail(); @Override - void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail); + void setProductDetail(ProductDetail _productDetail); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement", type = "ODataDemo.Advertisement", @@ -211,21 +211,21 @@ public interface FeaturedProduct targetContainer = "DemoService", targetEntitySet = "Advertisements", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement(); + Advertisement getAdvertisement(); - void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement); + void setAdvertisement(Advertisement _advertisement); @Override Operations operations(); - interface Operations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Operations { + interface Operations extends Product.Operations { // No additional methods needed for now. } @Override Annotations annotations(); - interface Annotations extends org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product.Annotations { + interface Annotations extends Product.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "ID", 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/demo/odatademo/types/FeaturedProductCollection.java similarity index 73% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductCollection.java index 9f7dcf527..ed87bc8d0 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/demo/odatademo/types/FeaturedProductCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface FeaturedProductCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java similarity index 82% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java index 140cb9da1..d2dd74091 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface FeaturedProductCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override FeaturedProductCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductComposableInvoker.java similarity index 86% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductComposableInvoker.java index ea80859da..8719896ef 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/FeaturedProductComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/FeaturedProductComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -145,9 +145,9 @@ public interface FeaturedProductComposableInvoker targetContainer = "DemoService", targetEntitySet = "Categories", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories(); + CategoryCollection getCategories(); - void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories); + void setCategories(CategoryCollection _categories); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier", type = "ODataDemo.Supplier", @@ -155,9 +155,9 @@ public interface FeaturedProductComposableInvoker targetContainer = "DemoService", targetEntitySet = "Suppliers", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier(); + Supplier getSupplier(); - void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier); + void setSupplier(Supplier _supplier); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail", type = "ODataDemo.ProductDetail", @@ -165,9 +165,9 @@ public interface FeaturedProductComposableInvoker targetContainer = "DemoService", targetEntitySet = "ProductDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail(); + ProductDetail getProductDetail(); - void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail); + void setProductDetail(ProductDetail _productDetail); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Advertisement", type = "ODataDemo.Advertisement", @@ -175,8 +175,8 @@ public interface FeaturedProductComposableInvoker targetContainer = "DemoService", targetEntitySet = "Advertisements", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement getAdvertisement(); + Advertisement getAdvertisement(); - void setAdvertisement(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Advertisement _advertisement); + void setAdvertisement(Advertisement _advertisement); } 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/demo/odatademo/types/Person.java similarity index 92% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Person.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Person.java index c81d52767..006bae721 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/demo/odatademo/types/Person.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -69,9 +69,9 @@ public interface Person targetContainer = "DemoService", targetEntitySet = "PersonDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail(); + PersonDetail getPersonDetail(); - void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail); + void setPersonDetail(PersonDetail _personDetail); Operations operations(); 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/demo/odatademo/types/PersonCollection.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonCollection.java index 064af50a4..87300ece6 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/demo/odatademo/types/PersonCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface PersonCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonCollectionComposableInvoker.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonCollectionComposableInvoker.java index 49f8c088e..febb1641e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface PersonCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override PersonCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonComposableInvoker.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonComposableInvoker.java index 7255bb1b2..2461c09f9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -70,8 +70,8 @@ public interface PersonComposableInvoker targetContainer = "DemoService", targetEntitySet = "PersonDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail getPersonDetail(); + PersonDetail getPersonDetail(); - void setPersonDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.PersonDetail _personDetail); + void setPersonDetail(PersonDetail _personDetail); } 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/demo/odatademo/types/PersonDetail.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetail.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetail.java index 5918747ba..6dca28751 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/demo/odatademo/types/PersonDetail.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -105,9 +105,9 @@ public interface PersonDetail unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress(); + Address getAddress(); - void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address); + void setAddress(Address _address); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo", type = "Edm.Stream", @@ -130,9 +130,9 @@ public interface PersonDetail targetContainer = "DemoService", targetEntitySet = "Persons", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson(); + Person getPerson(); - void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person); + void setPerson(Person _person); Operations operations(); 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/demo/odatademo/types/PersonDetailCollection.java similarity index 73% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetailCollection.java index d672ffc3a..c46df2a2a 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/demo/odatademo/types/PersonDetailCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface PersonDetailCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java similarity index 82% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java index e7d62d387..414955a86 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetailCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface PersonDetailCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override PersonDetailCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetailComposableInvoker.java similarity index 90% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetailComposableInvoker.java index 2d54c161a..547f4b9ac 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/PersonDetailComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/PersonDetailComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -105,9 +105,9 @@ public interface PersonDetailComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress(); + Address getAddress(); - void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address); + void setAddress(Address _address); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Photo", type = "Edm.Stream", @@ -130,8 +130,8 @@ public interface PersonDetailComposableInvoker targetContainer = "DemoService", targetEntitySet = "Persons", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person getPerson(); + Person getPerson(); - void setPerson(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Person _person); + void setPerson(Person _person); } 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/demo/odatademo/types/Product.java similarity index 92% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Product.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Product.java index cb3ff03c3..4fe51216e 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/demo/odatademo/types/Product.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.OperationType; @@ -145,9 +145,9 @@ public interface Product targetContainer = "DemoService", targetEntitySet = "Categories", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories(); + CategoryCollection getCategories(); - void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories); + void setCategories(CategoryCollection _categories); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier", type = "ODataDemo.Supplier", @@ -155,9 +155,9 @@ public interface Product targetContainer = "DemoService", targetEntitySet = "Suppliers", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier(); + Supplier getSupplier(); - void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier); + void setSupplier(Supplier _supplier); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail", type = "ODataDemo.ProductDetail", @@ -165,9 +165,9 @@ public interface Product targetContainer = "DemoService", targetEntitySet = "ProductDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail(); + ProductDetail getProductDetail(); - void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail); + void setProductDetail(ProductDetail _productDetail); Operations operations(); 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/demo/odatademo/types/ProductCollection.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductCollection.java index b9e6bb443..3347691be 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/demo/odatademo/types/ProductCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface ProductCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductCollectionComposableInvoker.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductCollectionComposableInvoker.java index 3d6bb61db..365359e67 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface ProductCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override ProductCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductComposableInvoker.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductComposableInvoker.java index 996894865..e03890c14 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -145,9 +145,9 @@ public interface ProductComposableInvoker targetContainer = "DemoService", targetEntitySet = "Categories", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection getCategories(); + CategoryCollection getCategories(); - void setCategories(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.CategoryCollection _categories); + void setCategories(CategoryCollection _categories); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Supplier", type = "ODataDemo.Supplier", @@ -155,9 +155,9 @@ public interface ProductComposableInvoker targetContainer = "DemoService", targetEntitySet = "Suppliers", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier getSupplier(); + Supplier getSupplier(); - void setSupplier(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Supplier _supplier); + void setSupplier(Supplier _supplier); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "ProductDetail", type = "ODataDemo.ProductDetail", @@ -165,8 +165,8 @@ public interface ProductComposableInvoker targetContainer = "DemoService", targetEntitySet = "ProductDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail getProductDetail(); + ProductDetail getProductDetail(); - void setProductDetail(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductDetail _productDetail); + void setProductDetail(ProductDetail _productDetail); } 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/demo/odatademo/types/ProductDetail.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetail.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetail.java index a17e5c3a1..f83a7edbc 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/demo/odatademo/types/ProductDetail.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -70,9 +70,9 @@ public interface ProductDetail targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product getProduct(); + Product getProduct(); - void setProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product _product); + void setProduct(Product _product); Operations operations(); 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/demo/odatademo/types/ProductDetailCollection.java similarity index 73% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetailCollection.java index 26e2eb918..5811902b7 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/demo/odatademo/types/ProductDetailCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface ProductDetailCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetailCollectionComposableInvoker.java similarity index 82% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetailCollectionComposableInvoker.java index bdb8e028c..15c1a65e2 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetailCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface ProductDetailCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override ProductDetailCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetailComposableInvoker.java similarity index 91% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetailComposableInvoker.java index 4f37bbfb4..3727129fc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/ProductDetailComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/ProductDetailComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -70,8 +70,8 @@ public interface ProductDetailComposableInvoker targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product getProduct(); + Product getProduct(); - void setProduct(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Product _product); + void setProduct(Product _product); } 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/demo/odatademo/types/Supplier.java similarity index 92% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/Supplier.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/Supplier.java index b0f608b44..82f7c58f8 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/demo/odatademo/types/Supplier.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -74,9 +74,9 @@ public interface Supplier unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress(); + Address getAddress(); - void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address); + void setAddress(Address _address); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Location", type = "Edm.GeographyPoint", @@ -114,9 +114,9 @@ public interface Supplier targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); + ProductCollection getProducts(); - void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); + void setProducts(ProductCollection _products); Operations operations(); 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/demo/odatademo/types/SupplierCollection.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/SupplierCollection.java index 473121625..112e79594 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/demo/odatademo/types/SupplierCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -26,8 +26,8 @@ import org.apache.olingo.ext.proxy.api.AbstractTerm; public interface SupplierCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/SupplierCollectionComposableInvoker.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/SupplierCollectionComposableInvoker.java index 4f4231367..2428a5259 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/SupplierCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface SupplierCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override SupplierCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/SupplierComposableInvoker.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/SupplierComposableInvoker.java index f7c2d3b85..f4b7bf408 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/SupplierComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/SupplierComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -75,9 +75,9 @@ public interface SupplierComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address getAddress(); + Address getAddress(); - void setAddress(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.Address _address); + void setAddress(Address _address); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Location", type = "Edm.GeographyPoint", @@ -115,8 +115,8 @@ public interface SupplierComposableInvoker targetContainer = "DemoService", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection getProducts(); + ProductCollection getProducts(); - void setProducts(org.apache.olingo.fit.proxy.v4.demo.odatademo.types.ProductCollection _products); + void setProducts(ProductCollection _products); } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/package-info.java similarity index 92% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/package-info.java index 4b7b2b1fa..fba4be15b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/odatademo/types/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/demo/odatademo/types/package-info.java @@ -16,5 +16,5 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.demo.odatademo.types; +package org.apache.olingo.fit.proxy.demo.odatademo.types; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java index 365e10d98..d6e1c6e18 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype; +package org.apache.olingo.fit.proxy.opentype; import java.util.HashMap; import java.util.Map; @@ -26,6 +26,12 @@ import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.AbstractTerm; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.AccountInfo; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Color; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex; public class Service extends AbstractService { @@ -90,23 +96,23 @@ public class Service extends AbstractService // CHECKSTYLE:OFF (Maven checkstyle) entityTypes.put("Microsoft.Test.OData.Services.OpenTypesServiceV4.Row", - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.class); + Row.class); entityTypes .put( "Microsoft.Test.OData.Services.OpenTypesServiceV4.IndexedRow", - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.IndexedRow.class); + IndexedRow.class); entityTypes.put("Microsoft.Test.OData.Services.OpenTypesServiceV4.RowIndex", - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.RowIndex.class); + RowIndex.class); complexTypes .put( "Microsoft.Test.OData.Services.OpenTypesServiceV4.AccountInfo", - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.AccountInfo.class); + AccountInfo.class); complexTypes .put( "Microsoft.Test.OData.Services.OpenTypesServiceV4.ContactDetails", - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.ContactDetails.class); + ContactDetails.class); enumTypes.put("Microsoft.Test.OData.Services.OpenTypesServiceV4.Color", - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Color.class); + Color.class); // CHECKSTYLE:ON (Maven checkstyle) } 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/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/DefaultContainer.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java index f96fe46cf..09bba09fc 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/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice; // CHECKSTYLE:OFF (Maven checkstyle) import java.io.InputStream; 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/opentype/microsoft/test/odata/services/opentypesservice/Row.java similarity index 72% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/Row.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java index a3f0ebe76..6f230ff2a 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/opentype/microsoft/test/odata/services/opentypesservice/Row.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +28,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.OpenTypesServiceV4.DefaultContainer") public interface Row extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java similarity index 71% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/RowIndex.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java index e2d4cff5b..cdc20c1da 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/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java @@ -16,10 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndexCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +28,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.OpenTypesServiceV4.DefaultContainer") public interface RowIndex extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java index 2392a8639..55fb49ba4 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java @@ -16,5 +16,5 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice; 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/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfo.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java index 5a7384548..0c2878395 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/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java new file mode 100644 index 000000000..5c6abad52 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface AccountInfoCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.ComplexCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java index bae485c12..746593c35 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface AccountInfoCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override AccountInfoCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java similarity index 95% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java index 33e364ce0..d4e186f26 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; 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/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Color.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java index 46d8621ad..0594588a7 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/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetails.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java index 5cb1a8562..3772b0ff2 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/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.Annotatable; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java new file mode 100644 index 000000000..035c1185a --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface ContactDetailsCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.ComplexCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java index 51b942bf0..d77451a17 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface ContactDetailsCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override ContactDetailsCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java index 2bbf41180..c55eec137 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java similarity index 84% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRow.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java index 3962c82e5..2de886916 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/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -33,7 +33,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "Microsoft.Test.OData.Services.OpenTypesServiceV4.Row") public interface IndexedRow extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row, + Row, AbstractOpenType { @Override @@ -73,7 +73,7 @@ public interface IndexedRow Operations operations(); interface Operations extends - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.Operations { + Row.Operations { // No additional methods needed for now. } @@ -81,7 +81,7 @@ public interface IndexedRow Annotations annotations(); interface Annotations extends - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row.Annotations { + Row.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Id", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java new file mode 100644 index 000000000..51ea58bad --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface IndexedRowCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java index 7a7dfaf7e..ee64c0259 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface IndexedRowCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override IndexedRowCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java similarity index 94% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java index 634afb616..56d971264 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; 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/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java similarity index 95% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/Row.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java index 1511cdcdf..eb5a3ccc9 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/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java new file mode 100644 index 000000000..c754aed8a --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface RowCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java similarity index 76% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java index 821973477..c3713a761 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface RowCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override RowCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java similarity index 94% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java index 1b0e66b09..f77f079d1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; 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/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndex.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java index 68e9374f7..eee12de7e 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/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; @@ -55,10 +55,10 @@ public interface RowIndex targetContainer = "DefaultContainer", targetEntitySet = "Row", containsTarget = false) - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row getRows(); + Row getRows(); void - setRows(org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row _rows); + setRows(Row _rows); Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java new file mode 100644 index 000000000..c0dae50b5 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface RowIndexCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java index 0fc3316a3..cb4f23f8e 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface RowIndexCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override RowIndexCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java similarity index 85% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java index d5852d1ee..52e3306b7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; @@ -56,9 +56,9 @@ public interface RowIndexComposableInvoker targetContainer = "DefaultContainer", targetEntitySet = "Row", containsTarget = false) - org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row getRows(); + Row getRows(); void - setRows(org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types.Row _rows); + setRows(Row _rows); } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java index f8ea3ce90..26254f992 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java @@ -16,5 +16,5 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java similarity index 77% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java index 644cac42c..5b5a82942 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/Service.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice; +package org.apache.olingo.fit.proxy.staticservice; import java.util.HashMap; import java.util.Map; @@ -26,6 +26,36 @@ import org.apache.olingo.client.api.EdmEnabledODataClient; import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion; import org.apache.olingo.ext.proxy.AbstractService; import org.apache.olingo.ext.proxy.api.AbstractTerm; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription; public class Service extends AbstractService { @@ -92,103 +122,103 @@ public class Service extends AbstractService entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.CreditCardPI", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.class); + CreditCardPI.class); entityTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Account", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.class); + Account.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail.class); + ProductDetail.class); entityTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Order", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order.class); + Order.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.Statement", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Statement.class); + Statement.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.Subscription", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription.class); + Subscription.class); entityTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Person", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.class); + Person.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.GiftCard", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard.class); + GiftCard.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail.class); + OrderDetail.class); entityTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Product", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product.class); + Product.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.class); + PaymentInstrument.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.Customer", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer.class); + Customer.class); entityTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Club", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club.class); + Club.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.ProductReview", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview.class); + ProductReview.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.Department", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department.class); + Department.class); entityTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Asset", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Asset.class); + Asset.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.Employee", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee.class); + Employee.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.StoredPI", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI.class); + StoredPI.class); entityTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Company", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.class); + Company.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditRecord.class); + CreditRecord.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion.class); + LabourUnion.class); entityTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.PublicCompany", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.class); + PublicCompany.class); complexTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Address", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.class); + Address.class); complexTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.CompanyAddress", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyAddress.class); + CompanyAddress.class); complexTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo.class); + AccountInfo.class); complexTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress.class); + HomeAddress.class); enumTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel.class); + AccessLevel.class); enumTypes.put("Microsoft.Test.OData.Services.ODataWCFService.Color", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color.class); + Color.class); enumTypes .put( "Microsoft.Test.OData.Services.ODataWCFService.CompanyCategory", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory.class); + CompanyCategory.class); terms.put("Microsoft.Test.OData.Services.ODataWCFService.IsBoss", - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.IsBoss.class); + IsBoss.class); // CHECKSTYLE:ON (Maven checkstyle) } 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/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java index dbf983760..61b8f7b6e 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/staticservice/microsoft/test/odata/services/odatawcfservice/Accounts.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +29,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface Accounts extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java index e1f3c8230..0974312aa 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/staticservice/microsoft/test/odata/services/odatawcfservice/Customers.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.CustomerCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +29,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface Customers extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java similarity index 67% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java index f7337fc12..8917add1c 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/staticservice/microsoft/test/odata/services/odatawcfservice/Departments.java @@ -16,10 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .DepartmentCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +30,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface Departments extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java index 17cf84c0b..4b1bccf9c 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/staticservice/microsoft/test/odata/services/odatawcfservice/Employees.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +29,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface Employees extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java index 95969e2ab..cbe45ed9e 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/staticservice/microsoft/test/odata/services/odatawcfservice/InMemoryEntities.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import java.io.InputStream; @@ -32,6 +32,18 @@ import org.apache.olingo.ext.proxy.api.EntityType; import org.apache.olingo.ext.proxy.api.OperationType; import org.apache.olingo.ext.proxy.api.PersistenceManager; import org.apache.olingo.ext.proxy.api.PrimitiveCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductCollectionComposableInvoker; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI; @org.apache.olingo.ext.proxy.api.annotations.Namespace("Microsoft.Test.OData.Services.ODataWCFService") @org.apache.olingo.ext.proxy.api.annotations.EntityContainer(name = "InMemoryEntities", @@ -65,35 +77,35 @@ public interface InMemoryEntities extends PersistenceManager { @org.apache.olingo.ext.proxy.api.annotations.Singleton( name = "PublicCompany", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company + Company getPublicCompany(); @org.apache.olingo.ext.proxy.api.annotations.Singleton( name = "DefaultStoredPI", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getDefaultStoredPI(); @org.apache.olingo.ext.proxy.api.annotations.Singleton( name = "VipCustomer", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer + Customer getVipCustomer(); @org.apache.olingo.ext.proxy.api.annotations.Singleton( name = "Company", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany(); + Company getCompany(); @org.apache.olingo.ext.proxy.api.annotations.Singleton( name = "Boss", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getBoss(); + Person getBoss(); @org.apache.olingo.ext.proxy.api.annotations.Singleton( name = "LabourUnion", container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion + LabourUnion getLabourUnion(); Operations operations(); @@ -115,9 +127,9 @@ public interface InMemoryEntities extends PersistenceManager { name = "GetPerson2", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.class, + referenceType = Person.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker + PersonComposableInvoker getPerson2( @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "city", type = "Edm.String", nullable = false) java.lang.String city ); @@ -126,9 +138,9 @@ public interface InMemoryEntities extends PersistenceManager { name = "GetDefaultColor", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color.class, + referenceType = Color.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.Color") - org.apache.olingo.ext.proxy.api.Invoker + org.apache.olingo.ext.proxy.api.Invoker getDefaultColor( ); @@ -136,12 +148,12 @@ public interface InMemoryEntities extends PersistenceManager { name = "GetPerson", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.class, + referenceType = Person.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonComposableInvoker + PersonComposableInvoker getPerson( @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address", - type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address + type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) Address address ); @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "GetProductsByAccessLevel", @@ -152,28 +164,28 @@ public interface InMemoryEntities extends PersistenceManager { org.apache.olingo.ext.proxy.api.PrimitiveCollectionInvoker> getProductsByAccessLevel( @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "accessLevel", - type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessLevel + type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", nullable = false) AccessLevel accessLevel ); @org.apache.olingo.ext.proxy.api.annotations.Operation( name = "GetAllProducts", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection.class, + referenceType = ProductCollection.class, returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Product)") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollectionComposableInvoker + ProductCollectionComposableInvoker getAllProducts( ); @org.apache.olingo.ext.proxy.api.annotations.Operation( name = "ResetBossAddress", type = OperationType.ACTION, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.class, + referenceType = Address.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.Address") - org.apache.olingo.ext.proxy.api.StructuredInvoker + org.apache.olingo.ext.proxy.api.StructuredInvoker
resetBossAddress( @org.apache.olingo.ext.proxy.api.annotations.Parameter(name = "address", - type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address address + type = "Microsoft.Test.OData.Services.ODataWCFService.Address", nullable = false) Address address ); @org.apache.olingo.ext.proxy.api.annotations.Operation(name = "ResetDataSource", 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/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java similarity index 64% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java index 0ec3737f9..c150e3b9d 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/staticservice/microsoft/test/odata/services/odatawcfservice/OrderDetails.java @@ -16,11 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .OrderDetailCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailKey; // CHECKSTYLE:ON (Maven checkstyle) @@ -28,9 +31,9 @@ import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.service container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface OrderDetails extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java index 93a5f93ed..7334de6ae 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/staticservice/microsoft/test/odata/services/odatawcfservice/Orders.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +29,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface Orders extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/People.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/People.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/People.java index 5d7306030..4b2a35a36 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/staticservice/microsoft/test/odata/services/odatawcfservice/People.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.PersonCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +29,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface People extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java similarity index 63% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java index 30598fadb..b70fd7bce 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/staticservice/microsoft/test/odata/services/odatawcfservice/ProductDetails.java @@ -16,11 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetail; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductDetailCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailKey; // CHECKSTYLE:ON (Maven checkstyle) @@ -28,9 +31,9 @@ import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.service container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface ProductDetails extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java similarity index 63% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java index a6353de44..04bb39532 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/staticservice/microsoft/test/odata/services/odatawcfservice/ProductReviews.java @@ -16,11 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; -import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewKey; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReview; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .ProductReviewCollection; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewKey; // CHECKSTYLE:ON (Maven checkstyle) @@ -28,9 +31,9 @@ import org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.service container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface ProductReviews extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java index 8381946db..bc1f21c62 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/staticservice/microsoft/test/odata/services/odatawcfservice/Products.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +29,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface Products extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java index 0f57df982..acf5a880b 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/staticservice/microsoft/test/odata/services/odatawcfservice/StoredPIs.java @@ -16,10 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPICollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +29,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface StoredPIs extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java similarity index 68% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java index ca5afce71..b912850a4 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/staticservice/microsoft/test/odata/services/odatawcfservice/SubscriptionTemplates.java @@ -16,10 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types.Subscription; +import org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types + .SubscriptionCollection; // CHECKSTYLE:ON (Maven checkstyle) @@ -27,9 +30,9 @@ import org.apache.olingo.ext.proxy.api.AbstractEntitySet; container = "Microsoft.Test.OData.Services.ODataWCFService.InMemoryEntities") public interface SubscriptionTemplates extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java new file mode 100644 index 000000000..5faa3a50c --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/package-info.java @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.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/AccessLevel.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java index 5d527badd..f41b2438d 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccessLevel.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java similarity index 69% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java index ea640becc..248746523 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Account.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -76,12 +76,12 @@ public interface Account unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo + AccountInfo getAccountInfo(); void setAccountInfo( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo _accountInfo); + AccountInfo _accountInfo); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyGiftCard", type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard", @@ -89,12 +89,12 @@ public interface Account targetContainer = "", targetEntitySet = "", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard + GiftCard getMyGiftCard(); void setMyGiftCard( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard _myGiftCard); + GiftCard _myGiftCard); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AvailableSubscriptionTemplatess", type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription", @@ -102,12 +102,12 @@ public interface Account targetContainer = "InMemoryEntities", targetEntitySet = "SubscriptionTemplates", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection + SubscriptionCollection getAvailableSubscriptionTemplatess(); void setAvailableSubscriptionTemplatess( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection _availableSubscriptionTemplatess); + SubscriptionCollection _availableSubscriptionTemplatess); Operations operations(); @@ -117,9 +117,9 @@ public interface Account name = "GetDefaultPI", type = OperationType.FUNCTION, isComposable = false, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.class, + referenceType = PaymentInstrument.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument") - org.apache.olingo.ext.proxy.api.StructuredInvoker + org.apache.olingo.ext.proxy.api.StructuredInvoker getDefaultPI( ); @@ -127,18 +127,18 @@ public interface Account name = "GetAccountInfo", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo.class, + referenceType = AccountInfo.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccountInfo") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfoComposableInvoker + AccountInfoComposableInvoker getAccountInfo( ); @org.apache.olingo.ext.proxy.api.annotations.Operation( name = "RefreshDefaultPI", type = OperationType.ACTION, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.class, + referenceType = PaymentInstrument.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument") - org.apache.olingo.ext.proxy.api.StructuredInvoker + org.apache.olingo.ext.proxy.api.StructuredInvoker refreshDefaultPI( @Parameter(name = "newDate", type = "Edm.DateTimeOffset", nullable = true) java.sql.Timestamp newDate ); @@ -185,19 +185,19 @@ public interface Account targetContainer = "InMemoryEntities", targetEntitySet = "SubscriptionTemplates", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments + Account.MyPaymentInstruments getMyPaymentInstruments(); void setMyPaymentInstruments( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments _myPaymentInstruments); + Account.MyPaymentInstruments _myPaymentInstruments); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MyPaymentInstruments", contained = true) interface MyPaymentInstruments extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } @@ -207,19 +207,19 @@ public interface Account targetContainer = "InMemoryEntities", targetEntitySet = "SubscriptionTemplates", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions + Account.ActiveSubscriptions getActiveSubscriptions(); void setActiveSubscriptions( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions _activeSubscriptions); + Account.ActiveSubscriptions _activeSubscriptions); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ActiveSubscriptions", contained = true) interface ActiveSubscriptions extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java new file mode 100644 index 000000000..875ee01f6 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface AccountCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java index 64928d00f..fd966bf96 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface AccountCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override AccountCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java similarity index 64% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java index 6aa8ebd78..1792bec58 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -76,12 +76,12 @@ public interface AccountComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo + AccountInfo getAccountInfo(); void setAccountInfo( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccountInfo _accountInfo); + AccountInfo _accountInfo); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyGiftCard", type = "Microsoft.Test.OData.Services.ODataWCFService.GiftCard", @@ -89,12 +89,12 @@ public interface AccountComposableInvoker targetContainer = "", targetEntitySet = "", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard + GiftCard getMyGiftCard(); void setMyGiftCard( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.GiftCard _myGiftCard); + GiftCard _myGiftCard); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AvailableSubscriptionTemplatess", type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription", @@ -102,12 +102,12 @@ public interface AccountComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "SubscriptionTemplates", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection + SubscriptionCollection getAvailableSubscriptionTemplatess(); void setAvailableSubscriptionTemplatess( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.SubscriptionCollection _availableSubscriptionTemplatess); + SubscriptionCollection _availableSubscriptionTemplatess); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "MyPaymentInstruments", type = "Microsoft.Test.OData.Services.ODataWCFService.Subscription", @@ -115,19 +115,19 @@ public interface AccountComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "SubscriptionTemplates", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments + Account.MyPaymentInstruments getMyPaymentInstruments(); void setMyPaymentInstruments( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.MyPaymentInstruments _myPaymentInstruments); + Account.MyPaymentInstruments _myPaymentInstruments); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "MyPaymentInstruments", contained = true) interface MyPaymentInstruments extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } @@ -137,19 +137,19 @@ public interface AccountComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "SubscriptionTemplates", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions + Account.ActiveSubscriptions getActiveSubscriptions(); void setActiveSubscriptions( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Account.ActiveSubscriptions _activeSubscriptions); + Account.ActiveSubscriptions _activeSubscriptions); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "ActiveSubscriptions", contained = true) interface ActiveSubscriptions extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java index 700d31e9b..3ac9a0a18 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java new file mode 100644 index 000000000..940018e99 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface AccountInfoCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.ComplexCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java index 895d8e860..54e8b006b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface AccountInfoCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override AccountInfoCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java similarity index 95% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java index 22715ad6e..85fb42d74 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java index 6928f0157..7942c93b3 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Address.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.Annotatable; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java new file mode 100644 index 000000000..19e3b97f9 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface AddressCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.ComplexCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java index 223572140..2c692528a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface AddressCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override AddressCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java similarity index 95% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java index 7df96e816..8f91d375d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java index 1bf79edaf..2971cfdca 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Asset.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java new file mode 100644 index 000000000..5a12aec0f --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface AssetCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollectionComposableInvoker.java index bc5e8c7b3..e34a0bc02 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface AssetCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override AssetCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetComposableInvoker.java similarity index 95% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetComposableInvoker.java index 0a61cd269..0fe030680 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java index 5bdb8f424..6ae594e07 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Club.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java new file mode 100644 index 000000000..8ae996bb7 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface ClubCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollectionComposableInvoker.java index 519921205..4365b5036 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface ClubCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override ClubCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubComposableInvoker.java similarity index 94% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubComposableInvoker.java index ee6852f46..1061b0102 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java index 89276bc65..db98e46f1 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Color.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java similarity index 83% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java index c56d10515..f8bfff0fc 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Company.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; @@ -62,12 +62,12 @@ public interface Company unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory + CompanyCategory getCompanyCategory(); void setCompanyCategory( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); + CompanyCategory _companyCategory); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue", type = "Edm.Int64", @@ -110,11 +110,11 @@ public interface Company unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress(); + Address getAddress(); void setAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); + Address _address); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees", type = "Microsoft.Test.OData.Services.ODataWCFService.Employee", @@ -122,12 +122,12 @@ public interface Company targetContainer = "InMemoryEntities", targetEntitySet = "Employees", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection + EmployeeCollection getEmployees(); void setEmployees( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees); + EmployeeCollection _employees); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer", type = "Microsoft.Test.OData.Services.ODataWCFService.Customer", @@ -135,12 +135,12 @@ public interface Company targetContainer = "InMemoryEntities", targetEntitySet = "VipCustomer", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer + Customer getVipCustomer(); void setVipCustomer( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer); + Customer _vipCustomer); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments", type = "Microsoft.Test.OData.Services.ODataWCFService.Department", @@ -148,12 +148,12 @@ public interface Company targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection + DepartmentCollection getDepartments(); void setDepartments( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments); + DepartmentCollection _departments); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment", type = "Microsoft.Test.OData.Services.ODataWCFService.Department", @@ -161,12 +161,12 @@ public interface Company targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department + Department getCoreDepartment(); void setCoreDepartment( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment); + Department _coreDepartment); Operations operations(); 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java index b9ff18efb..65a3871fe 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddress.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.Annotatable; @@ -29,7 +29,7 @@ import org.apache.olingo.ext.proxy.api.Annotatable; isAbstract = false, baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address") public interface CompanyAddress - extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { + extends Address { @Override @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", @@ -102,7 +102,7 @@ public interface CompanyAddress interface Annotations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations { + Address.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street", @@ -130,7 +130,7 @@ public interface CompanyAddress interface Operations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Operations { + Address.Operations { // No additional methods needed for now. } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollection.java new file mode 100644 index 000000000..41f0fb25f --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface CompanyAddressCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.ComplexCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollectionComposableInvoker.java index 4b64b4a1b..ed50f95c3 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface CompanyAddressCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override CompanyAddressCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressComposableInvoker.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressComposableInvoker.java index d416150bd..3514e8a99 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java similarity index 93% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java index 10ee92604..0312a1a80 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCategory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java new file mode 100644 index 000000000..2a3fff341 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface CompanyCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollectionComposableInvoker.java index 575c61a23..fc617360f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface CompanyCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override CompanyCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyComposableInvoker.java index 11697fd15..7a9fcc9ee 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractOpenType; @@ -61,12 +61,12 @@ public interface CompanyComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory + CompanyCategory getCompanyCategory(); void setCompanyCategory( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); + CompanyCategory _companyCategory); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue", type = "Edm.Int64", @@ -109,11 +109,11 @@ public interface CompanyComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress(); + Address getAddress(); void setAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); + Address _address); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Employees", type = "Microsoft.Test.OData.Services.ODataWCFService.Employee", @@ -121,12 +121,12 @@ public interface CompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Employees", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection + EmployeeCollection getEmployees(); void setEmployees( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees); + EmployeeCollection _employees); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer", type = "Microsoft.Test.OData.Services.ODataWCFService.Customer", @@ -134,12 +134,12 @@ public interface CompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "VipCustomer", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer + Customer getVipCustomer(); void setVipCustomer( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer); + Customer _vipCustomer); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments", type = "Microsoft.Test.OData.Services.ODataWCFService.Department", @@ -147,12 +147,12 @@ public interface CompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection + DepartmentCollection getDepartments(); void setDepartments( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments); + DepartmentCollection _departments); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment", type = "Microsoft.Test.OData.Services.ODataWCFService.Department", @@ -160,11 +160,11 @@ public interface CompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department + Department getCoreDepartment(); void setCoreDepartment( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment); + Department _coreDepartment); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java similarity index 84% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java index 7f0ee9003..6873492a9 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPI.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -33,7 +33,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "Microsoft.Test.OData.Services.ODataWCFService.PaymentInstrument") public interface CreditCardPI extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument { + PaymentInstrument { @Override CreditCardPI load(); @@ -184,13 +184,13 @@ public interface CreditCardPI targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getTheStoredPI(); @Override void setTheStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI); + StoredPI _theStoredPI); @Override @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI", @@ -199,20 +199,20 @@ public interface CreditCardPI targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getBackupStoredPI(); @Override void setBackupStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI); + StoredPI _backupStoredPI); @Override Operations operations(); interface Operations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.Operations { + PaymentInstrument.Operations { // No additional methods needed for now. } @@ -221,7 +221,7 @@ public interface CreditCardPI interface Annotations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.Annotations { + PaymentInstrument.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PaymentInstrumentID", @@ -284,19 +284,19 @@ public interface CreditCardPI targetContainer = "", targetEntitySet = "", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords + CreditCardPI.CreditRecords getCreditRecords(); void setCreditRecords( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords _creditRecords); + CreditCardPI.CreditRecords _creditRecords); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CreditRecords", contained = true) interface CreditRecords extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java new file mode 100644 index 000000000..8c12c94b9 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface CreditCardPICollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollectionComposableInvoker.java index 53278d187..b78a52bdc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface CreditCardPICollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override CreditCardPICollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPIComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPIComposableInvoker.java similarity index 80% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPIComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPIComposableInvoker.java index 908763b77..998396c92 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPIComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPIComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -161,12 +161,12 @@ public interface CreditCardPIComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getTheStoredPI(); void setTheStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI); + StoredPI _theStoredPI); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI", type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI", @@ -174,12 +174,12 @@ public interface CreditCardPIComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getBackupStoredPI(); void setBackupStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI); + StoredPI _backupStoredPI); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CreditRecords", type = "Microsoft.Test.OData.Services.ODataWCFService.CreditRecord", @@ -187,19 +187,19 @@ public interface CreditCardPIComposableInvoker targetContainer = "", targetEntitySet = "", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords + CreditCardPI.CreditRecords getCreditRecords(); void setCreditRecords( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CreditCardPI.CreditRecords _creditRecords); + CreditCardPI.CreditRecords _creditRecords); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "CreditRecords", contained = true) interface CreditRecords extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java similarity index 97% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java index 9821a4992..948bbc5e8 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecord.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java new file mode 100644 index 000000000..9be7ecc95 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface CreditRecordCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollectionComposableInvoker.java index bdc36fbf3..746fd5143 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface CreditRecordCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override CreditRecordCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordComposableInvoker.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordComposableInvoker.java index 85ef55527..f1e62ca57 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java index be254e4b1..ed6fdc175 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Customer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person") public interface Customer extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person { + Person { @Override Customer load(); @@ -130,13 +130,13 @@ public interface Customer unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address + Address getHomeAddress(); @Override void setHomeAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + Address _homeAddress); @Override @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home", @@ -241,11 +241,11 @@ public interface Customer targetContainer = "InMemoryEntities", targetEntitySet = "People", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent(); + Person getParent(); @Override void setParent( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent); + Person _parent); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders", type = "Microsoft.Test.OData.Services.ODataWCFService.Order", @@ -253,12 +253,12 @@ public interface Customer targetContainer = "InMemoryEntities", targetEntitySet = "Orders", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection + OrderCollection getOrders(); void setOrders( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection _orders); + OrderCollection _orders); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company", type = "Microsoft.Test.OData.Services.ODataWCFService.Company", @@ -266,18 +266,18 @@ public interface Customer targetContainer = "InMemoryEntities", targetEntitySet = "Company", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany(); + Company getCompany(); void setCompany( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company); + Company _company); @Override Operations operations(); interface Operations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations { + Person.Operations { // No additional methods needed for now. } @@ -286,7 +286,7 @@ public interface Customer interface Annotations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations { + Person.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java new file mode 100644 index 000000000..864161a89 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface CustomerCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java index 1a7ba5cbc..33b8444a7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface CustomerCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override CustomerCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java similarity index 86% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java index 7525933ac..2a268b1b0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -105,12 +105,12 @@ public interface CustomerComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address + Address getHomeAddress(); void setHomeAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + Address _homeAddress); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home", type = "Edm.GeographyPoint", @@ -208,10 +208,10 @@ public interface CustomerComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "People", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent(); + Person getParent(); void setParent( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent); + Person _parent); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Orders", type = "Microsoft.Test.OData.Services.ODataWCFService.Order", @@ -219,12 +219,12 @@ public interface CustomerComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Orders", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection + OrderCollection getOrders(); void setOrders( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderCollection _orders); + OrderCollection _orders); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company", type = "Microsoft.Test.OData.Services.ODataWCFService.Company", @@ -232,10 +232,10 @@ public interface CustomerComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Company", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany(); + Company getCompany(); void setCompany( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company); + Company _company); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java similarity index 91% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java index 7bd886912..9070d22c5 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Department.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -84,11 +84,11 @@ public interface Department targetContainer = "InMemoryEntities", targetEntitySet = "Company", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany(); + Company getCompany(); void setCompany( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company); + Company _company); Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java new file mode 100644 index 000000000..514a3eebd --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface DepartmentCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java index 88103be8f..47ff436dc 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface DepartmentCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override DepartmentCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java index 08427f411..58cc11fcb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -85,10 +85,10 @@ public interface DepartmentComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Company", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany(); + Company getCompany(); void setCompany( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company); + Company _company); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java index f65a9e5df..f33ccb36a 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Employee.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -32,7 +32,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "Microsoft.Test.OData.Services.ODataWCFService.Person") public interface Employee extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person { + Person { @Override Employee load(); @@ -130,13 +130,13 @@ public interface Employee unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address + Address getHomeAddress(); @Override void setHomeAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + Address _homeAddress); @Override @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home", @@ -226,11 +226,11 @@ public interface Employee targetContainer = "InMemoryEntities", targetEntitySet = "People", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent(); + Person getParent(); @Override void setParent( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent); + Person _parent); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company", type = "Microsoft.Test.OData.Services.ODataWCFService.Company", @@ -238,18 +238,18 @@ public interface Employee targetContainer = "InMemoryEntities", targetEntitySet = "Company", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany(); + Company getCompany(); void setCompany( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company); + Company _company); @Override Operations operations(); interface Operations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Operations { + Person.Operations { // No additional methods needed for now. } @@ -258,7 +258,7 @@ public interface Employee interface Annotations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.Annotations { + Person.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "PersonID", diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java new file mode 100644 index 000000000..0207f060a --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface EmployeeCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java index d5556ebbe..3e24a55bf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface EmployeeCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override EmployeeCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java index 251634092..136b7db06 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -105,12 +105,12 @@ public interface EmployeeComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address + Address getHomeAddress(); void setHomeAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + Address _homeAddress); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home", type = "Edm.GeographyPoint", @@ -193,10 +193,10 @@ public interface EmployeeComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "People", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent(); + Person getParent(); void setParent( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent); + Person _parent); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Company", type = "Microsoft.Test.OData.Services.ODataWCFService.Company", @@ -204,10 +204,10 @@ public interface EmployeeComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Company", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company getCompany(); + Company getCompany(); void setCompany( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company _company); + Company _company); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java similarity index 97% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java index d1432e64a..0be3d7e51 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCard.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.OperationType; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java new file mode 100644 index 000000000..171809930 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface GiftCardCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java index 40cab5be9..c53a6d0b9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface GiftCardCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override GiftCardCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java index 0672afdd7..673e7e854 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java similarity index 88% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java index 02e7ec426..9b76b6a06 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddress.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.Annotatable; @@ -29,7 +29,7 @@ import org.apache.olingo.ext.proxy.api.Annotatable; isAbstract = false, baseType = "Microsoft.Test.OData.Services.ODataWCFService.Address") public interface HomeAddress - extends org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address { + extends Address { @Override @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Street", @@ -102,7 +102,7 @@ public interface HomeAddress interface Annotations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Annotations { + Address.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "Street", @@ -130,7 +130,7 @@ public interface HomeAddress interface Operations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address.Operations { + Address.Operations { // No additional methods needed for now. } } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollection.java new file mode 100644 index 000000000..6cd0d659c --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface HomeAddressCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.ComplexCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollectionComposableInvoker.java index aa5ed6ebb..b4967b65b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface HomeAddressCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override HomeAddressCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java index 8c9f1779e..dcff261fa 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java similarity index 92% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java index 8df09d569..358460e48 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/IsBoss.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractTerm; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java index 8abed0106..39d42d4df 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnion.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java new file mode 100644 index 000000000..2c50f3d96 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface LabourUnionCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java index b2a0d0b2c..9f735ed08 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface LabourUnionCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override LabourUnionCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java similarity index 95% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java index ed3d9916d..7a96e1ee7 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java similarity index 87% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java index bec370087..6f9fbbee7 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Order.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -99,12 +99,12 @@ public interface Order targetContainer = "InMemoryEntities", targetEntitySet = "Employees", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee + Employee getLoggedInEmployee(); void setLoggedInEmployee( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee _loggedInEmployee); + Employee _loggedInEmployee); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CustomerForOrder", type = "Microsoft.Test.OData.Services.ODataWCFService.Customer", @@ -112,12 +112,12 @@ public interface Order targetContainer = "InMemoryEntities", targetEntitySet = "Customers", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer + Customer getCustomerForOrder(); void setCustomerForOrder( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _customerForOrder); + Customer _customerForOrder); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "OrderDetails", type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail", @@ -125,12 +125,12 @@ public interface Order targetContainer = "InMemoryEntities", targetEntitySet = "OrderDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection + OrderDetailCollection getOrderDetails(); void setOrderDetails( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection _orderDetails); + OrderDetailCollection _orderDetails); Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java new file mode 100644 index 000000000..9b00746f3 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface OrderCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java index 7e64e1f6b..027922305 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface OrderCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override OrderCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java similarity index 82% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java index 94817ee11..bb3e80bdf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -100,12 +100,12 @@ public interface OrderComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Employees", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee + Employee getLoggedInEmployee(); void setLoggedInEmployee( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Employee _loggedInEmployee); + Employee _loggedInEmployee); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CustomerForOrder", type = "Microsoft.Test.OData.Services.ODataWCFService.Customer", @@ -113,12 +113,12 @@ public interface OrderComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Customers", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer + Customer getCustomerForOrder(); void setCustomerForOrder( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _customerForOrder); + Customer _customerForOrder); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "OrderDetails", type = "Microsoft.Test.OData.Services.ODataWCFService.OrderDetail", @@ -126,11 +126,11 @@ public interface OrderComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "OrderDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection + OrderDetailCollection getOrderDetails(); void setOrderDetails( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.OrderDetailCollection _orderDetails); + OrderDetailCollection _orderDetails); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java similarity index 90% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java index 28b3f4551..ff092615d 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetail.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -118,12 +118,12 @@ public interface OrderDetail targetContainer = "InMemoryEntities", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection + ProductCollection getProductOrdered(); void setProductOrdered( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection _productOrdered); + ProductCollection _productOrdered); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AssociatedOrder", type = "Microsoft.Test.OData.Services.ODataWCFService.Order", @@ -131,12 +131,12 @@ public interface OrderDetail targetContainer = "InMemoryEntities", targetEntitySet = "Orders", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order + Order getAssociatedOrder(); void setAssociatedOrder( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order _associatedOrder); + Order _associatedOrder); Operations operations(); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java new file mode 100644 index 000000000..4c64a9a4d --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface OrderDetailCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java index f8592953a..c423577cf 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface OrderDetailCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override OrderDetailCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailComposableInvoker.java similarity index 87% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailComposableInvoker.java index 64f3bcb97..a5c317870 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -116,12 +116,12 @@ public interface OrderDetailComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection + ProductCollection getProductOrdered(); void setProductOrdered( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductCollection _productOrdered); + ProductCollection _productOrdered); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "AssociatedOrder", type = "Microsoft.Test.OData.Services.ODataWCFService.Order", @@ -129,11 +129,11 @@ public interface OrderDetailComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Orders", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order + Order getAssociatedOrder(); void setAssociatedOrder( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Order _associatedOrder); + Order _associatedOrder); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java similarity index 94% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java index 27fd5f351..b9658cd37 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailKey.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.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/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java similarity index 80% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java index ae5e40880..7be9777da 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrument.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -85,12 +85,12 @@ public interface PaymentInstrument targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getTheStoredPI(); void setTheStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI); + StoredPI _theStoredPI); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI", type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI", @@ -98,12 +98,12 @@ public interface PaymentInstrument targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getBackupStoredPI(); void setBackupStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI); + StoredPI _backupStoredPI); Operations operations(); @@ -146,19 +146,19 @@ public interface PaymentInstrument targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements + PaymentInstrument.BillingStatements getBillingStatements(); void setBillingStatements( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements _billingStatements); + PaymentInstrument.BillingStatements _billingStatements); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "BillingStatements", contained = true) interface BillingStatements extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java new file mode 100644 index 000000000..590f0cf95 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface PaymentInstrumentCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollectionComposableInvoker.java index f8ce98380..94f7fa936 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface PaymentInstrumentCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override PaymentInstrumentCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentComposableInvoker.java similarity index 74% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentComposableInvoker.java index 1e14355a9..f2b614dc0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -87,12 +87,12 @@ public interface PaymentInstrumentComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getTheStoredPI(); void setTheStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _theStoredPI); + StoredPI _theStoredPI); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BackupStoredPI", type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI", @@ -100,12 +100,12 @@ public interface PaymentInstrumentComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI + StoredPI getBackupStoredPI(); void setBackupStoredPI( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.StoredPI _backupStoredPI); + StoredPI _backupStoredPI); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "BillingStatements", type = "Microsoft.Test.OData.Services.ODataWCFService.StoredPI", @@ -113,19 +113,19 @@ public interface PaymentInstrumentComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "StoredPIs", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements + PaymentInstrument.BillingStatements getBillingStatements(); void setBillingStatements( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PaymentInstrument.BillingStatements _billingStatements); + PaymentInstrument.BillingStatements _billingStatements); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "BillingStatements", contained = true) interface BillingStatements extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java similarity index 86% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java index 0042c9499..a5f006e64 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Person.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.OperationType; @@ -105,12 +105,12 @@ public interface Person unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address + Address getHomeAddress(); void setHomeAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + Address _homeAddress); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home", type = "Edm.GeographyPoint", @@ -163,10 +163,10 @@ public interface Person targetContainer = "InMemoryEntities", targetEntitySet = "People", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent(); + Person getParent(); void setParent( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent); + Person _parent); Operations operations(); @@ -176,21 +176,21 @@ public interface Person name = "GetHomeAddress", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddress.class, + referenceType = HomeAddress.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.HomeAddress") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.HomeAddressComposableInvoker + HomeAddressComposableInvoker getHomeAddress( ); @org.apache.olingo.ext.proxy.api.annotations.Operation( name = "ResetAddress", type = OperationType.ACTION, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person.class, + referenceType = Person.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.Person") - org.apache.olingo.ext.proxy.api.StructuredInvoker + org.apache.olingo.ext.proxy.api.StructuredInvoker resetAddress( @Parameter(name = "addresses", type = "Collection(Microsoft.Test.OData.Services.ODataWCFService.Address)", - nullable = false) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AddressCollection addresses, + nullable = false) AddressCollection addresses, @Parameter(name = "index", type = "Edm.Int32", nullable = false) java.lang.Integer index ); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java new file mode 100644 index 000000000..4a507977b --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface PersonCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollectionComposableInvoker.java index 2692c1ab8..e4a892ebb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface PersonCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override PersonCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonComposableInvoker.java similarity index 89% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonComposableInvoker.java index d362f63d1..05e608378 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -105,12 +105,12 @@ public interface PersonComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address + Address getHomeAddress(); void setHomeAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _homeAddress); + Address _homeAddress); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Home", type = "Edm.GeographyPoint", @@ -163,9 +163,9 @@ public interface PersonComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "People", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person getParent(); + Person getParent(); void setParent( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Person _parent); + Person _parent); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java similarity index 81% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java index 3b0bba011..8ef6b4979 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Product.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.OperationType; @@ -135,12 +135,12 @@ public interface Product unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel + AccessLevel getUserAccess(); void setUserAccess( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess); + AccessLevel _userAccess); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SkinColor", type = "Microsoft.Test.OData.Services.ODataWCFService.Color", @@ -153,11 +153,11 @@ public interface Product unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getSkinColor(); + Color getSkinColor(); void setSkinColor( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor); + Color _skinColor); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CoverColors", type = "Microsoft.Test.OData.Services.ODataWCFService.Color", @@ -170,12 +170,12 @@ public interface Product unicode = true, collation = "", srid = "") - org.apache.olingo.ext.proxy.api.PrimitiveCollection + org.apache.olingo.ext.proxy.api.PrimitiveCollection getCoverColors(); void setCoverColors( - org.apache.olingo.ext.proxy.api.PrimitiveCollection _coverColors); + org.apache.olingo.ext.proxy.api.PrimitiveCollection _coverColors); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Details", type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail", @@ -183,12 +183,12 @@ public interface Product targetContainer = "InMemoryEntities", targetEntitySet = "ProductDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection + ProductDetailCollection getDetails(); void setDetails( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection _details); + ProductDetailCollection _details); Operations operations(); @@ -198,9 +198,9 @@ public interface Product name = "GetProductDetails", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection.class, + referenceType = ProductDetailCollection.class, returnType = "Collection(Microsoft.Test.OData.Services.ODataWCFService.ProductDetail)") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollectionComposableInvoker + ProductDetailCollectionComposableInvoker getProductDetails( @Parameter(name = "count", type = "Edm.Int32", nullable = true) java.lang.Integer count ); @@ -208,12 +208,12 @@ public interface Product @org.apache.olingo.ext.proxy.api.annotations.Operation( name = "AddAccessRight", type = OperationType.ACTION, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel.class, + referenceType = AccessLevel.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel") - org.apache.olingo.ext.proxy.api.Invoker + org.apache.olingo.ext.proxy.api.Invoker addAccessRight( @Parameter(name = "accessRight", type = "Microsoft.Test.OData.Services.ODataWCFService.AccessLevel", - nullable = true) org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel accessRight + nullable = true) AccessLevel accessRight ); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java similarity index 65% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java index 71e88a4a0..4faab64b6 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.Collection; @@ -28,8 +28,8 @@ import org.apache.olingo.ext.proxy.api.annotations.Parameter; public interface ProductCollection extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { Operations operations(); @@ -38,9 +38,9 @@ org.apache.olingo.ext.proxy.api.EntityCollection + org.apache.olingo.ext.proxy.api.StructuredCollectionInvoker discount( @Parameter(name = "percentage", type = "Edm.Int32", nullable = false) java.lang.Integer percentage ); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollectionComposableInvoker.java index 21f811de8..a43fba076 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface ProductCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override ProductCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductComposableInvoker.java similarity index 81% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductComposableInvoker.java index cab441dfc..ad61add2a 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -135,12 +135,12 @@ public interface ProductComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel + AccessLevel getUserAccess(); void setUserAccess( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.AccessLevel _userAccess); + AccessLevel _userAccess); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "SkinColor", type = "Microsoft.Test.OData.Services.ODataWCFService.Color", @@ -153,11 +153,11 @@ public interface ProductComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color getSkinColor(); + Color getSkinColor(); void setSkinColor( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Color _skinColor); + Color _skinColor); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "CoverColors", type = "Microsoft.Test.OData.Services.ODataWCFService.Color", @@ -170,12 +170,12 @@ public interface ProductComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.ext.proxy.api.PrimitiveCollection + org.apache.olingo.ext.proxy.api.PrimitiveCollection getCoverColors(); void setCoverColors( - org.apache.olingo.ext.proxy.api.PrimitiveCollection _coverColors); + org.apache.olingo.ext.proxy.api.PrimitiveCollection _coverColors); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Details", type = "Microsoft.Test.OData.Services.ODataWCFService.ProductDetail", @@ -183,11 +183,11 @@ public interface ProductComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "ProductDetails", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection + ProductDetailCollection getDetails(); void setDetails( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductDetailCollection _details); + ProductDetailCollection _details); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java similarity index 86% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java index 41b78cca1..3118b8a42 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetail.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.OperationType; @@ -104,12 +104,12 @@ public interface ProductDetail targetContainer = "InMemoryEntities", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product + Product getRelatedProduct(); void setRelatedProduct( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product _relatedProduct); + Product _relatedProduct); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews", type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview", @@ -117,12 +117,12 @@ public interface ProductDetail targetContainer = "InMemoryEntities", targetEntitySet = "ProductReviews", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection + ProductReviewCollection getReviews(); void setReviews( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection _reviews); + ProductReviewCollection _reviews); Operations operations(); @@ -132,9 +132,9 @@ public interface ProductDetail name = "GetRelatedProduct", type = OperationType.FUNCTION, isComposable = true, - referenceType = org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product.class, + referenceType = Product.class, returnType = "Microsoft.Test.OData.Services.ODataWCFService.Product") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductComposableInvoker + ProductComposableInvoker getRelatedProduct( ); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java new file mode 100644 index 000000000..351468d90 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface ProductDetailCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollectionComposableInvoker.java index 3c2c40a7b..c5ab2bd32 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface ProductDetailCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override ProductDetailCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailComposableInvoker.java similarity index 85% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailComposableInvoker.java index de647a91d..1413ee78b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; @@ -101,12 +101,12 @@ public interface ProductDetailComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Products", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product + Product getRelatedProduct(); void setRelatedProduct( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Product _relatedProduct); + Product _relatedProduct); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Reviews", type = "Microsoft.Test.OData.Services.ODataWCFService.ProductReview", @@ -114,11 +114,11 @@ public interface ProductDetailComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "ProductReviews", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection + ProductReviewCollection getReviews(); void setReviews( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.ProductReviewCollection _reviews); + ProductReviewCollection _reviews); } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java similarity index 94% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java index 19f0f1b0a..fe4298744 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailKey.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java similarity index 98% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java index fa433ed8a..0aced0666 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReview.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java new file mode 100644 index 000000000..1a260074c --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface ProductReviewCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollectionComposableInvoker.java index 1d584c540..9a10d65eb 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface ProductReviewCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override ProductReviewCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewComposableInvoker.java similarity index 97% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewComposableInvoker.java index dea9b42ce..507620582 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java similarity index 95% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java index f02b3e4fe..eff975bda 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewKey.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.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/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java similarity index 76% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java index 5fc32a05f..cdace92b0 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompany.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import java.util.concurrent.Future; @@ -34,7 +34,7 @@ import org.apache.olingo.ext.proxy.api.annotations.Key; baseType = "Microsoft.Test.OData.Services.ODataWCFService.Company") public interface PublicCompany extends org.apache.olingo.ext.proxy.api.Annotatable, - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company, + Company, AbstractOpenType { @Override @@ -82,13 +82,13 @@ public interface PublicCompany unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory + CompanyCategory getCompanyCategory(); @Override void setCompanyCategory( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); + CompanyCategory _companyCategory); @Override @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue", @@ -136,12 +136,12 @@ public interface PublicCompany unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress(); + Address getAddress(); @Override void setAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); + Address _address); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StockExchange", type = "Edm.String", @@ -165,13 +165,13 @@ public interface PublicCompany targetContainer = "InMemoryEntities", targetEntitySet = "Employees", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection + EmployeeCollection getEmployees(); @Override void setEmployees( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees); + EmployeeCollection _employees); @Override @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer", @@ -180,13 +180,13 @@ public interface PublicCompany targetContainer = "InMemoryEntities", targetEntitySet = "VipCustomer", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer + Customer getVipCustomer(); @Override void setVipCustomer( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer); + Customer _vipCustomer); @Override @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments", @@ -195,13 +195,13 @@ public interface PublicCompany targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection + DepartmentCollection getDepartments(); @Override void setDepartments( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments); + DepartmentCollection _departments); @Override @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment", @@ -210,13 +210,13 @@ public interface PublicCompany targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department + Department getCoreDepartment(); @Override void setCoreDepartment( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment); + Department _coreDepartment); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Club", type = "Microsoft.Test.OData.Services.ODataWCFService.Club", @@ -224,10 +224,10 @@ public interface PublicCompany targetContainer = "", targetEntitySet = "", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club getClub(); + Club getClub(); void setClub( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club _club); + Club _club); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LabourUnion", type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion", @@ -235,19 +235,19 @@ public interface PublicCompany targetContainer = "InMemoryEntities", targetEntitySet = "LabourUnion", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion + LabourUnion getLabourUnion(); void setLabourUnion( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion _labourUnion); + LabourUnion _labourUnion); @Override Operations operations(); interface Operations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.Operations { + Company.Operations { // No additional methods needed for now. } @@ -256,7 +256,7 @@ public interface PublicCompany interface Annotations extends - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Company.Annotations { + Company.Annotations { @Override @org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty(name = "CompanyID", @@ -326,19 +326,19 @@ public interface PublicCompany targetContainer = "InMemoryEntities", targetEntitySet = "LabourUnion", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets + PublicCompany.Assets getAssets(); void setAssets( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets _assets); + PublicCompany.Assets _assets); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Assets", contained = true) interface Assets extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java new file mode 100644 index 000000000..65b906f70 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface PublicCompanyCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollectionComposableInvoker.java index 2778d7f41..4d712705b 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface PublicCompanyCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override PublicCompanyCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyComposableInvoker.java similarity index 70% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyComposableInvoker.java index 29a46c87e..dca239de6 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.AbstractEntitySet; @@ -62,12 +62,12 @@ public interface PublicCompanyComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory + CompanyCategory getCompanyCategory(); void setCompanyCategory( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.CompanyCategory _companyCategory); + CompanyCategory _companyCategory); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "Revenue", type = "Edm.Int64", @@ -110,11 +110,11 @@ public interface PublicCompanyComposableInvoker unicode = true, collation = "", srid = "") - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address getAddress(); + Address getAddress(); void setAddress( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Address _address); + Address _address); @org.apache.olingo.ext.proxy.api.annotations.Property(name = "StockExchange", type = "Edm.String", @@ -137,12 +137,12 @@ public interface PublicCompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Employees", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection + EmployeeCollection getEmployees(); void setEmployees( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.EmployeeCollection _employees); + EmployeeCollection _employees); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "VipCustomer", type = "Microsoft.Test.OData.Services.ODataWCFService.Customer", @@ -150,12 +150,12 @@ public interface PublicCompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "VipCustomer", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer + Customer getVipCustomer(); void setVipCustomer( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Customer _vipCustomer); + Customer _vipCustomer); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Departments", type = "Microsoft.Test.OData.Services.ODataWCFService.Department", @@ -163,12 +163,12 @@ public interface PublicCompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection + DepartmentCollection getDepartments(); void setDepartments( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.DepartmentCollection _departments); + DepartmentCollection _departments); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "CoreDepartment", type = "Microsoft.Test.OData.Services.ODataWCFService.Department", @@ -176,12 +176,12 @@ public interface PublicCompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "Departments", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department + Department getCoreDepartment(); void setCoreDepartment( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Department _coreDepartment); + Department _coreDepartment); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Club", type = "Microsoft.Test.OData.Services.ODataWCFService.Club", @@ -189,10 +189,10 @@ public interface PublicCompanyComposableInvoker targetContainer = "", targetEntitySet = "", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club getClub(); + Club getClub(); void setClub( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.Club _club); + Club _club); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "LabourUnion", type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion", @@ -200,12 +200,12 @@ public interface PublicCompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "LabourUnion", containsTarget = false) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion + LabourUnion getLabourUnion(); void setLabourUnion( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.LabourUnion _labourUnion); + LabourUnion _labourUnion); @org.apache.olingo.ext.proxy.api.annotations.NavigationProperty(name = "Assets", type = "Microsoft.Test.OData.Services.ODataWCFService.LabourUnion", @@ -213,19 +213,19 @@ public interface PublicCompanyComposableInvoker targetContainer = "InMemoryEntities", targetEntitySet = "LabourUnion", containsTarget = true) - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets + PublicCompany.Assets getAssets(); void setAssets( - org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types.PublicCompany.Assets _assets); + PublicCompany.Assets _assets); @org.apache.olingo.ext.proxy.api.annotations.EntitySet(name = "Assets", contained = true) interface Assets extends - org.apache.olingo.ext.proxy.api.EntitySet, + org.apache.olingo.ext.proxy.api.EntitySet, org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, - AbstractEntitySet { + AbstractEntitySet { // No additional methods needed for now. } 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java similarity index 97% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java index bfbeb6d2c..40625709c 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Statement.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java new file mode 100644 index 000000000..2f07e8727 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface StatementCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java index 62924a6ab..df14aacc1 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface StatementCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override StatementCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java index 1a5d30fa4..c6b290a9f 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java similarity index 97% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java index 608b023cd..23945817f 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPI.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java new file mode 100644 index 000000000..b2622d901 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface StoredPICollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java index d8d1f3630..a9c65f5a9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface StoredPICollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override StoredPICollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java index 3fba8d6c6..f6d5d49d9 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPIComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java similarity index 97% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java index 406d78ab6..6a638793a 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/staticservice/microsoft/test/odata/services/odatawcfservice/types/Subscription.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java new file mode 100644 index 000000000..ae35e6af8 --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java @@ -0,0 +1,41 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + +// CHECKSTYLE:OFF (Maven checkstyle) +import java.util.Collection; +// CHECKSTYLE:ON (Maven checkstyle) + +import org.apache.olingo.ext.proxy.api.AbstractTerm; + +public interface SubscriptionCollection + extends + org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, +org.apache.olingo.ext.proxy.api.EntityCollection { + + Operations operations(); + + interface Operations extends org.apache.olingo.ext.proxy.api.Operations { + // No additional methods needed for now. + } + + Object getAnnotation(Class term); + + Collection> getAnnotationTerms(); +} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java similarity index 75% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java index 269782e04..82e628c70 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollectionComposableInvoker.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) public interface SubscriptionCollectionComposableInvoker extends - org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { + org.apache.olingo.ext.proxy.api.StructuredCollectionComposableInvoker { @Override SubscriptionCollectionComposableInvoker select(String... select); diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java similarity index 96% rename from fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java rename to fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java index ebe99594c..6c0a2c8e0 100644 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionComposableInvoker.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; // CHECKSTYLE:OFF (Maven checkstyle) import org.apache.olingo.ext.proxy.api.annotations.Key; diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java new file mode 100644 index 000000000..bb754bdad --- /dev/null +++ b/fit/src/test/java/org/apache/olingo/fit/proxy/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java @@ -0,0 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.olingo.fit.proxy.staticservice.microsoft.test.odata.services.odatawcfservice.types; + diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoCollection.java deleted file mode 100644 index caf335523..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/AccountInfoCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface AccountInfoCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.ComplexCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsCollection.java deleted file mode 100644 index faa3e09a8..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/ContactDetailsCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface ContactDetailsCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.ComplexCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index a9af8e622..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/IndexedRowCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface IndexedRowCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 7fc7ff21f..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface RowCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 4b57e8a45..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/RowIndexCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface RowIndexCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java deleted file mode 100644 index bf860c4dc..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/microsoft/test/odata/services/opentypesservicev4/types/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.opentype.microsoft.test.odata.services.opentypesservicev4.types; - 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 deleted file mode 100644 index 2fcdd6f68..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface AccountCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java deleted file mode 100644 index 2f19ddb79..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AccountInfoCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface AccountInfoCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.ComplexCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java deleted file mode 100644 index 8ab50b3de..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AddressCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface AddressCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.ComplexCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 9941a2c0b..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/AssetCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface AssetCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 5d7c7e18a..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ClubCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface ClubCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollection.java deleted file mode 100644 index 4e9398d33..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyAddressCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface CompanyAddressCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.ComplexCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 6fdc15c15..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CompanyCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface CompanyCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 2115db5f1..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditCardPICollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface CreditCardPICollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 6ce50c026..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CreditRecordCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface CreditRecordCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index e358eed85..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/CustomerCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface CustomerCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 16a818369..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/DepartmentCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface DepartmentCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index b9bf519f4..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/EmployeeCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface EmployeeCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 988128ebb..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/GiftCardCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface GiftCardCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollection.java deleted file mode 100644 index eae20c491..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/HomeAddressCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface HomeAddressCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.ComplexCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 901a50bed..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/LabourUnionCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface LabourUnionCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index f7575f783..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface OrderCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 4001219ef..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/OrderDetailCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface OrderDetailCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 7c83d5102..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PaymentInstrumentCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface PaymentInstrumentCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 66ae1766a..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PersonCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface PersonCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 92783adba..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductDetailCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface ProductDetailCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index bdbc9cdf8..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/ProductReviewCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface ProductReviewCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 1d5eb1072..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/PublicCompanyCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface PublicCompanyCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 67e223dbc..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StatementCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface StatementCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index 25e78e241..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/StoredPICollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface StoredPICollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} 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 deleted file mode 100644 index d8471fdac..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/SubscriptionCollection.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - -// CHECKSTYLE:OFF (Maven checkstyle) -import java.util.Collection; -// CHECKSTYLE:ON (Maven checkstyle) - -import org.apache.olingo.ext.proxy.api.AbstractTerm; - -public interface SubscriptionCollection - extends - org.apache.olingo.ext.proxy.api.StructuredCollectionQuery, -org.apache.olingo.ext.proxy.api.EntityCollection { - - Operations operations(); - - interface Operations extends org.apache.olingo.ext.proxy.api.Operations { - // No additional methods needed for now. - } - - Object getAnnotation(Class term); - - Collection> getAnnotationTerms(); -} diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java deleted file mode 100644 index 50d10e37c..000000000 --- a/fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/microsoft/test/odata/services/odatawcfservice/types/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.olingo.fit.proxy.v4.staticservice.microsoft.test.odata.services.odatawcfservice.types; - diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java index 66456cccb..970a4d96d 100644 --- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java +++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java @@ -57,7 +57,7 @@ import org.apache.olingo.commons.api.format.ContentType; import org.apache.olingo.commons.api.http.HttpHeader; import org.apache.olingo.commons.api.http.HttpStatusCode; import org.apache.olingo.fit.tecsvc.TecSvcConst; -import org.apache.olingo.fit.v4.AbstractTestITCase; +import org.apache.olingo.fit.base.AbstractTestITCase; import org.junit.Before; import org.junit.Test; diff --git a/pom.xml b/pom.xml index 6d6afa8ed..6b2359bc3 100644 --- a/pom.xml +++ b/pom.xml @@ -526,13 +526,9 @@ true warning - **/fit/proxy/v4/staticservice/**/*.java, - **/fit/proxy/v3/staticservice/**/*.java, - **/fit/proxy/v3/actionoverloading/**/*.java, - **/fit/proxy/v3/primitivekeys/**/*.java, - **/fit/proxy/v3/opentype/**/*.java, - **/fit/proxy/v4/opentype/**/*.java, - **/fit/proxy/v4/demo/**/*.java + **/fit/proxy/staticservice/**/*.java, + **/fit/proxy/opentype/**/*.java, + **/fit/proxy/demo/**/*.java