Apache
/
olingo-odata4
mirror of https://github.com/apache/olingo-odata4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[OLINGO-575] Move v4 package content one package up

This commit is contained in:
Christian Amend 2015-02-18 16:33:56 +01:00
parent c8865db8e8
commit 109c33ba39
294 changed files with 860 additions and 1200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/api/Search.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.ext.proxy.api;
import org.apache.olingo.client.api.uri.v4.URISearch;
import org.apache.olingo.client.api.uri.URISearch;
import java.io.Serializable;
import java.util.Collection;

4
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractCollectionInvocationHandler.java
View File

@ -19,6 +19,7 @@
package org.apache.olingo.ext.proxy.commons;
import java.io.Serializable;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
import java.lang.reflect.Proxy;
@ -31,11 +32,12 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.uri.URIFilter;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;

3
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractEntityCollectionInvocationHandler.java
View File

@ -20,10 +20,10 @@ package org.apache.olingo.ext.proxy.commons;
import org.apache.commons.lang3.tuple.ImmutableTriple;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
@ -37,6 +37,7 @@ import java.lang.reflect.Type;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
import org.apache.olingo.ext.proxy.api.EntityType;

10
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractPersistenceManager.java
View File

@ -32,13 +32,13 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.communication.header.ODataPreferences;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.ODataReferenceAddingRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataReferenceAddingRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
@ -465,7 +465,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
final ODataEntityUpdateRequest<CommonODataEntity> req =
((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
getEntityUpdateRequest(handler.getEntityURI(),
org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes);
org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes);
req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent());
@ -487,7 +487,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
if (service.getClient().getServiceVersion().compareTo(ODataServiceVersion.V30) >= 1) {
final ODataReferenceAddingRequest req =
((org.apache.olingo.client.api.v4.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
((org.apache.olingo.client.api.EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
getReferenceAddingRequest(sericeRoot, source, targetRef);
req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent());
@ -517,7 +517,7 @@ abstract class AbstractPersistenceManager implements PersistenceManager {
final ODataEntityUpdateRequest<CommonODataEntity> req =
((EdmEnabledODataClient) service.getClient()).getCUDRequestFactory().
getEntityUpdateRequest(uri,
org.apache.olingo.client.api.communication.request.cud.v4.UpdateType.PATCH, changes);
org.apache.olingo.client.api.communication.request.cud.UpdateType.PATCH, changes);
req.setPrefer(new ODataPreferences(service.getClient().getServiceVersion()).returnContent());

3
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/AbstractStructuredInvocationHandler.java
View File

@ -34,12 +34,13 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.Callable;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;

2
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/EntitySetInvocationHandler.java
View File

@ -28,9 +28,9 @@ import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
import org.apache.olingo.commons.api.edm.FullQualifiedName;

7
ext/client-proxy/src/main/java/org/apache/olingo/ext/proxy/commons/SearchImpl.java
View File

@ -19,10 +19,11 @@
package org.apache.olingo.ext.proxy.commons;
import java.net.URI;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.v4.URISearch;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.uri.URISearch;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.ext.proxy.api.EntityCollection;
import org.apache.olingo.ext.proxy.api.EntityType;

2
ext/pojogen-maven-plugin/src/main/java/org/apache/olingo/ext/pojogen/V4POJOGenMojo.java
View File

@ -20,7 +20,7 @@ package org.apache.olingo.ext.pojogen;
import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmSchema;

4
ext/pojogen-maven-plugin/src/main/resources/service.vm
View File

@ -56,7 +56,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param serviceRoot OData service root
* @return OData 4.0 instance for given service root, operating in transactions (with batch requests)
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot) {
return getV4(serviceRoot, true);
@ -69,7 +69,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param transactional whether operating in transactions (with batch requests) or not
* @return OData 4.0 instance for given service root
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot, final boolean transactional) {
return getInstance(ODataServiceVersion.V40, serviceRoot, transactional);

3
fit/src/test/java/org/apache/olingo/fit/proxy/v4/APIBasicDesignTestITCase.java
View File

@ -31,10 +31,11 @@ import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.TimeZone;
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.EdmStreamValue;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/AbstractTestITCase.java
View File

@ -30,7 +30,7 @@ import java.util.Calendar;
import java.util.TimeZone;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityCreateTestITCase.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/AuthEntityRetrieveTestITCase.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

3
fit/src/test/java/org/apache/olingo/fit/proxy/v4/ContextTestITCase.java
View File

@ -25,7 +25,8 @@ import static org.junit.Assert.fail;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.TimeZone;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

3
fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityCreateTestITCase.java
View File

@ -20,7 +20,7 @@ package org.apache.olingo.fit.proxy.v4;
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.commons.lang3.RandomUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.ext.proxy.AbstractService;
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;
@ -44,6 +44,7 @@ import java.math.BigDecimal;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.TimeZone;
import org.apache.olingo.ext.proxy.api.PrimitiveCollection;
import static org.junit.Assert.assertEquals;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/EntityUpdateTestITCase.java
View File

@ -21,7 +21,7 @@ package org.apache.olingo.fit.proxy.v4;
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.commons.lang3.RandomUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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.types.CompanyAddress;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/KeyAsSegmentTestITCase.java
View File

@ -21,7 +21,7 @@ package org.apache.olingo.fit.proxy.v4;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.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;

3
fit/src/test/java/org/apache/olingo/fit/proxy/v4/MediaEntityTestITCase.java
View File

@ -27,9 +27,10 @@ import java.io.IOException;
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.UUID;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalAuthEntityCreateTestITCase.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityCreateTestITCase.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalEntityUpdateTestITCase.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/NonTransactionalMediaEntityTestITCase.java
View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
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;

3
fit/src/test/java/org/apache/olingo/fit/proxy/v4/OpenTypeTestITCase.java
View File

@ -29,7 +29,8 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.UUID;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.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;

2
fit/src/test/java/org/apache/olingo/fit/proxy/v4/UnauthorizedEntityCreateTestITCase.java
View File

@ -18,8 +18,8 @@
*/
package org.apache.olingo.fit.proxy.v4;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.api.v4.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;

4
fit/src/test/java/org/apache/olingo/fit/proxy/v4/demo/Service.java
View File

@ -54,7 +54,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param serviceRoot OData service root
* @return OData 4.0 instance for given service root, operating in transactions (with batch requests)
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot) {
return getV4(serviceRoot, true);
@ -67,7 +67,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param transactional whether operating in transactions (with batch requests) or not
* @return OData 4.0 instance for given service root
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot, final boolean transactional) {
return getInstance(ODataServiceVersion.V40, serviceRoot, transactional);

4
fit/src/test/java/org/apache/olingo/fit/proxy/v4/opentype/Service.java
View File

@ -55,7 +55,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param serviceRoot OData service root
* @return OData 4.0 instance for given service root, operating in transactions (with batch requests)
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot) {
return getV4(serviceRoot, true);
@ -68,7 +68,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param transactional whether operating in transactions (with batch requests) or not
* @return OData 4.0 instance for given service root
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot, final boolean transactional) {
return getInstance(ODataServiceVersion.V40, serviceRoot, transactional);

4
fit/src/test/java/org/apache/olingo/fit/proxy/v4/staticservice/Service.java
View File

@ -55,7 +55,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param serviceRoot OData service root
* @return OData 4.0 instance for given service root, operating in transactions (with batch requests)
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot) {
return getV4(serviceRoot, true);
@ -68,7 +68,7 @@ public class Service<C extends CommonEdmEnabledODataClient<?>> extends AbstractS
* @param transactional whether operating in transactions (with batch requests) or not
* @return OData 4.0 instance for given service root
*/
public static Service<org.apache.olingo.client.api.v4.EdmEnabledODataClient> getV4(
public static Service<org.apache.olingo.client.api.EdmEnabledODataClient> getV4(
final String serviceRoot, final boolean transactional) {
return getInstance(ODataServiceVersion.V40, serviceRoot, transactional);

10
fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BasicITCase.java
View File

@ -32,11 +32,12 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
@ -46,9 +47,8 @@ import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.edm.xml.Reference;
import org.apache.olingo.client.api.edm.xml.XMLMetadata;
import org.apache.olingo.client.api.edm.xml.v4.Reference;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.ODataError;
import org.apache.olingo.commons.api.domain.ODataServiceDocument;
@ -119,11 +119,11 @@ public class BasicITCase extends AbstractBaseTestITCase {
XMLMetadata xmlMetadata = response.getBody();
assertNotNull(xmlMetadata);
assertTrue(xmlMetadata instanceof org.apache.olingo.client.api.edm.xml.v4.XMLMetadata);
assertTrue(xmlMetadata instanceof XMLMetadata);
assertEquals(2, xmlMetadata.getSchemas().size());
assertEquals("olingo.odata.test1", xmlMetadata.getSchema("olingo.odata.test1").getNamespace());
final List<Reference> references =
((org.apache.olingo.client.api.edm.xml.v4.XMLMetadata) xmlMetadata).getReferences();
((XMLMetadata) xmlMetadata).getReferences();
assertEquals(1, references.size());
assertThat(references.get(0).getUri().toASCIIString(), containsString("vocabularies/Org.OData.Core.V1"));
}

6
fit/src/test/java/org/apache/olingo/fit/tecsvc/client/BatchClientITCase.java
View File

@ -31,19 +31,19 @@ import java.util.Iterator;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.request.batch.BatchManager;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.request.batch.ODataChangeset;
import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.response.ODataBatchResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;

2
fit/src/test/java/org/apache/olingo/fit/tecsvc/client/MediaITCase.java
View File

@ -29,6 +29,7 @@ import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest;
@ -38,7 +39,6 @@ import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;

2
fit/src/test/java/org/apache/olingo/fit/tecsvc/client/NavigationITCase.java
View File

@ -22,8 +22,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;

2
fit/src/test/java/org/apache/olingo/fit/tecsvc/client/PrimitiveComplexITCase.java
View File

@ -29,13 +29,13 @@ import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;

4
fit/src/test/java/org/apache/olingo/fit/v4/AbstractTestITCase.java
View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.ODataCollectionValue;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;

6
fit/src/test/java/org/apache/olingo/fit/v4/AsyncTestITCase.java
View File

@ -18,12 +18,12 @@
*/
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.communication.request.AsyncRequestWrapper;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.v4.AsyncRequestWrapper;
import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.ODataInlineEntity;

8
fit/src/test/java/org/apache/olingo/fit/v4/AuthBatchTestITCase.java
View File

@ -18,17 +18,17 @@
*/
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.batch.BatchManager;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataChangeset;
import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.response.ODataBatchResponse;
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;

12
fit/src/test/java/org/apache/olingo/fit/v4/BatchTestITCase.java
View File

@ -21,24 +21,24 @@ package org.apache.olingo.fit.v4;
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.AsyncBatchRequestWrapper;
import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
import org.apache.olingo.client.api.communication.request.batch.BatchManager;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.request.batch.ODataChangeset;
import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.v4.AsyncBatchRequestWrapper;
import org.apache.olingo.client.api.communication.response.AsyncResponse;
import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper;
import org.apache.olingo.client.api.communication.response.ODataBatchResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.communication.response.v4.AsyncResponse;
import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager;
import org.apache.olingo.client.core.communication.request.Wrapper;
import org.apache.olingo.client.core.communication.request.batch.ODataChangesetResponseItem;

2
fit/src/test/java/org/apache/olingo/fit/v4/BoundOperationInvokeTestITCase.java
View File

@ -20,7 +20,7 @@ package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.ODataCollectionValue;
import org.apache.olingo.commons.api.domain.ODataComplexValue;
import org.apache.olingo.commons.api.domain.ODataOperation;

10
fit/src/test/java/org/apache/olingo/fit/v4/ConformanceTestITCase.java
View File

@ -19,21 +19,21 @@
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.AsyncRequestWrapper;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataDeltaRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.retrieve.v4.ODataDeltaRequest;
import org.apache.olingo.client.api.communication.request.v4.AsyncRequestWrapper;
import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.http.BasicAuthHttpClientFactory;
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
import org.apache.olingo.client.core.uri.URIUtils;

2
fit/src/test/java/org/apache/olingo/fit/v4/DeltaTestITCase.java
View File

@ -18,8 +18,8 @@
*/
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.communication.request.retrieve.ODataDeltaRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.retrieve.v4.ODataDeltaRequest;
import org.apache.olingo.commons.api.domain.v4.ODataDelta;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;

2
fit/src/test/java/org/apache/olingo/fit/v4/DerivedTypeTestITCase.java
View File

@ -23,7 +23,7 @@ import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateR
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.ODataComplexValue;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;

7
fit/src/test/java/org/apache/olingo/fit/v4/EntityRetrieveTestITCase.java
View File

@ -24,13 +24,13 @@ import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest;
import org.apache.olingo.client.api.communication.response.ODataRawResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
@ -44,6 +44,7 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.Test;
import java.net.URI;
import java.sql.Timestamp;
import java.util.LinkedHashMap;

4
fit/src/test/java/org/apache/olingo/fit/v4/EntitySetTestITCase.java
View File

@ -18,14 +18,14 @@
*/
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataRawRequest;
import org.apache.olingo.client.api.communication.response.ODataRawResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.domain.ODataEntitySetIterator;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;

6
fit/src/test/java/org/apache/olingo/fit/v4/EntityUpdateTestITCase.java
View File

@ -28,10 +28,10 @@ import java.util.TimeZone;
import java.util.UUID;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.ODataReferenceAddingRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.ODataReferenceAddingRequest;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.v4.ODataReferenceAddingResponse;
import org.apache.olingo.client.api.communication.response.ODataReferenceAddingResponse;
import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;

6
fit/src/test/java/org/apache/olingo/fit/v4/FilterFactoryTestITCase.java
View File

@ -19,10 +19,10 @@
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.uri.FilterArgFactory;
import org.apache.olingo.client.api.uri.FilterFactory;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.api.uri.URIFilter;
import org.apache.olingo.client.api.uri.v4.FilterArgFactory;
import org.apache.olingo.client.api.uri.v4.FilterFactory;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
import org.apache.olingo.commons.api.format.ODataFormat;

4
fit/src/test/java/org/apache/olingo/fit/v4/KeyAsSegmentTestITCase.java
View File

@ -19,11 +19,11 @@
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;
import org.apache.olingo.commons.api.edm.FullQualifiedName;

6
fit/src/test/java/org/apache/olingo/fit/v4/MediaEntityTestITCase.java
View File

@ -20,9 +20,10 @@ package org.apache.olingo.fit.v4;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataMediaRequest;
import org.apache.olingo.client.api.communication.request.streamed.MediaEntityCreateStreamManager;
@ -33,8 +34,7 @@ import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResp
import org.apache.olingo.client.api.communication.response.ODataMediaEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataMediaEntityUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataValuable;

8
fit/src/test/java/org/apache/olingo/fit/v4/OAuth2TestITCase.java
View File

@ -22,18 +22,20 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.EdmEnabledODataClient;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.client.core.ODataClientFactory;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import java.net.URI;
import org.apache.olingo.client.core.http.DefaultHttpClientFactory;
import org.apache.olingo.fit.CXFOAuth2HttpClientFactory;

2
fit/src/test/java/org/apache/olingo/fit/v4/OpenTypeTestITCase.java
View File

@ -21,7 +21,7 @@ package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.ODataComplexValue;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;

6
fit/src/test/java/org/apache/olingo/fit/v4/PropertyTestITCase.java
View File

@ -23,17 +23,17 @@ import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;
import org.apache.olingo.commons.api.domain.v4.ODataValuable;

2
fit/src/test/java/org/apache/olingo/fit/v4/PropertyValueTestITCase.java
View File

@ -22,7 +22,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;
import org.apache.olingo.commons.api.domain.v4.ODataValuable;

2
fit/src/test/java/org/apache/olingo/fit/v4/QueryOptionsTestITCase.java
View File

@ -22,7 +22,7 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRe
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.ODataInlineEntitySet;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;

6
fit/src/test/java/org/apache/olingo/fit/v4/SingletonTestITCase.java
View File

@ -18,12 +18,12 @@
*/
package org.apache.olingo.fit.v4;
import org.apache.olingo.client.api.ODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.v4.ODataAnnotation;
import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
import org.apache.olingo.commons.api.domain.v4.ODataValuable;

7
lib/client-api/src/main/java/org/apache/olingo/client/api/v4/EdmEnabledODataClient.java → lib/client-api/src/main/java/org/apache/olingo/client/api/EdmEnabledODataClient.java
View File

@ -16,12 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.v4;
package org.apache.olingo.client.api;
import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.invoke.EdmEnabledInvokeRequestFactory;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.uri.URIBuilder;
public interface EdmEnabledODataClient extends CommonEdmEnabledODataClient<UpdateType>, ODataClient {

25
lib/client-api/src/main/java/org/apache/olingo/client/api/v4/ODataClient.java → lib/client-api/src/main/java/org/apache/olingo/client/api/ODataClient.java
View File

@ -16,20 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.v4;
package org.apache.olingo.client.api;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.batch.v4.BatchRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.v4.RetrieveRequestFactory;
import org.apache.olingo.client.api.communication.request.v4.AsyncRequestFactory;
import org.apache.olingo.client.api.serialization.v4.ODataBinder;
import org.apache.olingo.client.api.serialization.v4.ODataDeserializer;
import org.apache.olingo.client.api.serialization.v4.ODataReader;
import org.apache.olingo.client.api.uri.v4.FilterFactory;
import org.apache.olingo.client.api.uri.v4.SearchFactory;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.communication.request.AsyncRequestFactory;
import org.apache.olingo.client.api.communication.request.batch.BatchRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.CUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.RetrieveRequestFactory;
import org.apache.olingo.client.api.serialization.ODataBinder;
import org.apache.olingo.client.api.serialization.ODataDeserializer;
import org.apache.olingo.client.api.serialization.ODataReader;
import org.apache.olingo.client.api.uri.FilterFactory;
import org.apache.olingo.client.api.uri.SearchFactory;
import org.apache.olingo.client.api.uri.URIBuilder;
import org.apache.olingo.commons.api.domain.v4.ODataObjectFactory;
import org.apache.olingo.commons.api.format.ODataFormat;

3
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/v4/AsyncBatchRequestWrapper.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/AsyncBatchRequestWrapper.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.v4;
package org.apache.olingo.client.api.communication.request;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataChangeset;
import org.apache.olingo.client.api.communication.response.ODataBatchResponse;

5
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/v4/AsyncRequestFactory.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/AsyncRequestFactory.java
View File

@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.v4;
package org.apache.olingo.client.api.communication.request;
import org.apache.olingo.client.api.communication.request.ODataRequest;
import org.apache.olingo.client.api.communication.request.batch.v4.ODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequest;
import org.apache.olingo.client.api.communication.response.ODataResponse;
public interface AsyncRequestFactory {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/v4/AsyncRequestWrapper.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/AsyncRequestWrapper.java
View File

@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.v4;
package org.apache.olingo.client.api.communication.request;
import java.net.URI;
import org.apache.olingo.client.api.communication.response.AsyncResponseWrapper;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper;
public interface AsyncRequestWrapper<R extends ODataResponse> {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/ODataRequest.java
View File

@ -29,9 +29,9 @@ import org.apache.olingo.commons.api.http.HttpMethod;
* Abstract representation of an OData request. Get instance by using factories.
*
* @see org.apache.olingo.client.api.communication.request.cud.v3.CUDRequestFactory
* @see org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFactory
* @see org.apache.olingo.client.api.communication.request.cud.CUDRequestFactory
* @see org.apache.olingo.client.api.communication.request.batch.v3.BatchRequestFactory
* @see org.apache.olingo.client.api.communication.request.batch.v4.BatchRequestFactory
* @see org.apache.olingo.client.api.communication.request.batch.BatchRequestFactory
* @see org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory
*/
public interface ODataRequest {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/v4/BatchRequestFactory.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/BatchRequestFactory.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.batch.v4;
package org.apache.olingo.client.api.communication.request.batch;
import org.apache.olingo.client.api.communication.request.batch.CommonBatchRequestFactory;
public interface BatchRequestFactory extends CommonBatchRequestFactory {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/v4/ODataBatchRequest.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/ODataBatchRequest.java
View File

@ -16,11 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.batch.v4;
package org.apache.olingo.client.api.communication.request.batch;
import org.apache.olingo.client.api.communication.request.ODataStreamedRequest;
import org.apache.olingo.client.api.communication.request.batch.BatchManager;
import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
import org.apache.olingo.client.api.communication.response.ODataBatchResponse;
public interface ODataBatchRequest

3
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/v4/ODataOutsideUpdate.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/batch/ODataOutsideUpdate.java
View File

@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.batch.v4;
package org.apache.olingo.client.api.communication.request.batch;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchRequestItem;
/**
* Retrieve request wrapper for the corresponding batch item.

4
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v4/CUDRequestFactory.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/CUDRequestFactory.java
View File

@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.cud.v4;
package org.apache.olingo.client.api.communication.request.cud;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
public interface CUDRequestFactory extends CommonCUDRequestFactory<UpdateType> {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v4/ODataReferenceAddingRequest.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/ODataReferenceAddingRequest.java
View File

@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.cud.v4;
package org.apache.olingo.client.api.communication.request.cud;
import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
import org.apache.olingo.client.api.communication.response.v4.ODataReferenceAddingResponse;
import org.apache.olingo.client.api.communication.response.ODataReferenceAddingResponse;
/**
* This class implements an OData reference adding request.

3
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/v4/UpdateType.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/cud/UpdateType.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.cud.v4;
package org.apache.olingo.client.api.communication.request.cud;
import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType;
import org.apache.olingo.commons.api.http.HttpMethod;
/**

3
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/ODataDeltaRequest.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataDeltaRequest.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.retrieve.v4;
package org.apache.olingo.client.api.communication.request.retrieve;
import org.apache.olingo.client.api.communication.request.retrieve.ODataRetrieveRequest;
import org.apache.olingo.commons.api.domain.v4.ODataDelta;
/**

7
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/v4/RetrieveRequestFactory.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/RetrieveRequestFactory.java
View File

@ -16,15 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.request.retrieve.v4;
package org.apache.olingo.client.api.communication.request.retrieve;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataPropertyRequest;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;

3
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/v4/AsyncResponse.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/AsyncResponse.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.response.v4;
package org.apache.olingo.client.api.communication.response;
import org.apache.olingo.client.api.communication.response.ODataResponse;
public interface AsyncResponse extends ODataResponse {
}

5
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/v4/AsyncResponseWrapper.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/AsyncResponseWrapper.java
View File

@ -16,13 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.response.v4;
package org.apache.olingo.client.api.communication.response;
import java.net.URI;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataResponse;
public interface AsyncResponseWrapper<R extends ODataResponse> {
/**

5
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/v4/ODataReferenceAddingResponse.java → lib/client-api/src/main/java/org/apache/olingo/client/api/communication/response/ODataReferenceAddingResponse.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.communication.response.v4;
package org.apache.olingo.client.api.communication.response;
import org.apache.olingo.client.api.communication.response.ODataResponse;
/**
* This class implements the response to an OData Reference Adding request.
@ -26,7 +25,7 @@ import org.apache.olingo.client.api.communication.response.ODataResponse;
* If the request was successful, the service response has status code 204 and
* the body has to be empty.
*
* @see org.apache.olingo.api.request.cud.v4.ODataReferenceAddingRequest
* @see org.apache.olingo.client.api.communication.request.cud.api.request.cud.v4.ODataReferenceAddingRequest
*/
public interface ODataReferenceAddingResponse extends ODataResponse {
}

4
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Action.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Action.java
View File

@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
public interface Action extends Named, Annotatable {
boolean isBound();

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ActionImport.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ActionImport.java
View File

@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
public interface ActionImport extends OperationImport {

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotatable.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotatable.java
View File

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

4
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotation.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotation.java
View File

@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
import org.apache.olingo.client.api.edm.xml.annotation.AnnotationExpression;
public interface Annotation extends Annotatable {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Annotations.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Annotations.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.client.api.edm.xml.CommonAnnotations;
public interface Annotations extends CommonAnnotations, Annotatable {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/BindingTarget.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/BindingTarget.java
View File

@ -16,12 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
public interface BindingTarget extends Named, Annotatable {
List<? extends NavigationPropertyBinding> getNavigationPropertyBindings();

16
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ComplexType.java
View File

@ -20,13 +20,19 @@ package org.apache.olingo.client.api.edm.xml;
import java.util.List;
public interface ComplexType extends Named {
public interface ComplexType extends Named, Annotatable {
CommonProperty getProperty(String name);
boolean isAbstractEntityType();
List<? extends CommonProperty> getProperties();
String getBaseType();
CommonNavigationProperty getNavigationProperty(String name);
boolean isOpenType();
List<? extends CommonNavigationProperty> getNavigationProperties();
Property getProperty(String name);
List<Property> getProperties();
NavigationProperty getNavigationProperty(String name);
List<NavigationProperty> getNavigationProperties();
}

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/DataServices.java
View File

@ -26,5 +26,5 @@ public interface DataServices {
String getMaxDataServiceVersion();
List<? extends Schema> getSchemas();
List<Schema> getSchemas();
}

18
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Edmx.java
View File

@ -1,26 +1,30 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* 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
*
* 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
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml;
import java.util.List;
public interface Edmx {
String getVersion();
DataServices getDataServices();
List<Reference> getReferences();
}

20
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntityContainer.java
View File

@ -20,7 +20,7 @@ package org.apache.olingo.client.api.edm.xml;
import java.util.List;
public interface EntityContainer extends Named {
public interface EntityContainer extends Named, Annotatable {
String getExtends();
@ -30,11 +30,21 @@ public interface EntityContainer extends Named {
EntitySet getEntitySet(String name);
List<? extends EntitySet> getEntitySets();
List<EntitySet> getEntitySets();
CommonFunctionImport getFunctionImport(String name);
List<Singleton> getSingletons();
List<? extends CommonFunctionImport> getFunctionImports(String name);
Singleton getSingleton(String name);
List<? extends CommonFunctionImport> getFunctionImports();
ActionImport getActionImport(String name);
List<ActionImport> getActionImports(String name);
List<ActionImport> getActionImports();
FunctionImport getFunctionImport(String name);
List<FunctionImport> getFunctionImports(String name);
List<FunctionImport> getFunctionImports();
}

4
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/EntitySet.java
View File

@ -18,8 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml;
public interface EntitySet extends Named {
public interface EntitySet extends Named, BindingTarget {
String getEntityType();
boolean isIncludeInServiceDocument();
}

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Function.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Function.java
View File

@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
public interface Function extends Action {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/FunctionImport.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/FunctionImport.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.client.api.edm.xml.CommonFunctionImport;
public interface FunctionImport extends OperationImport, CommonFunctionImport {

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Include.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Include.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
public interface Include {

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/IncludeAnnotations.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/IncludeAnnotations.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
public interface IncludeAnnotations {

5
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/NavigationProperty.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationProperty.java
View File

@ -16,13 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty;
import org.apache.olingo.client.api.edm.xml.OnDelete;
public interface NavigationProperty extends CommonNavigationProperty, Annotatable {
String getType();

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/NavigationPropertyBinding.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/NavigationPropertyBinding.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
public interface NavigationPropertyBinding {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/OperationImport.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OperationImport.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.client.api.edm.xml.Named;
public interface OperationImport extends Named, Annotatable {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Parameter.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Parameter.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.client.api.edm.xml.CommonParameter;
import org.apache.olingo.commons.api.edm.geo.SRID;
public interface Parameter extends CommonParameter, Annotatable {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Property.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Property.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.client.api.edm.xml.CommonProperty;
public interface Property extends CommonProperty, Annotatable {

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Reference.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Reference.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import java.net.URI;
import java.util.List;

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ReferentialConstraint.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReferentialConstraint.java
View File

@ -16,7 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
public interface ReferentialConstraint extends Annotatable {

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/ReturnType.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/ReturnType.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.commons.api.edm.geo.SRID;

61
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Schema.java
View File

@ -19,6 +19,7 @@
package org.apache.olingo.client.api.edm.xml;
import java.util.List;
import java.util.Map;
public interface Schema {
@ -26,20 +27,10 @@ public interface Schema {
String getAlias();
List<? extends EntityType> getEntityTypes();
List<EnumType> getEnumTypes();
EnumType getEnumType(String name);
List<? extends CommonAnnotations> getAnnotationGroups();
CommonAnnotations getAnnotationGroup(String target);
List<? extends ComplexType> getComplexTypes();
List<? extends EntityContainer> getEntityContainers();
/**
* Gets default entity container.
*
@ -55,20 +46,44 @@ public interface Schema {
*/
EntityContainer getEntityContainer(String name);
/**
* Gets entity type with the given name.
*
* @param name name.
* @return entity type.
*/
EntityType getEntityType(String name);
List<EntityContainer> getEntityContainers();
EntityContainer getEntityContainer();
/**
* Gets complex type with the given name.
*
* @param name name.
* @return complex type.
*/
ComplexType getComplexType(String name);
List<ComplexType> getComplexTypes();
EntityType getEntityType(String name);
List<EntityType> getEntityTypes();
List<Action> getActions();
List<Action> getActions(String name);
Annotation getAnnotation(String term);
Map<String, Annotatable> getAnnotatables();
List<Function> getFunctions();
List<Function> getFunctions(String name);
Term getTerm(String name);
List<Term> getTerms();
TypeDefinition getTypeDefinition(String name);
List<TypeDefinition> getTypeDefinitions();
List<Annotations> getAnnotationGroups();
Annotations getAnnotationGroup(String target);
//TODO: Check if there are annotations in V4
List<Annotation> getAnnotations();
}

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Singleton.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Singleton.java
View File

@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import org.apache.olingo.client.api.edm.xml.EntitySet;
public interface Singleton extends EntitySet, BindingTarget {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/Term.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/Term.java
View File

@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
import org.apache.olingo.commons.api.edm.geo.SRID;
public interface Term extends Named, Annotatable {

3
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/TypeDefinition.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/TypeDefinition.java
View File

@ -16,11 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4;
package org.apache.olingo.client.api.edm.xml;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
import org.apache.olingo.commons.api.edm.geo.SRID;
public interface TypeDefinition extends Named, Annotatable {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/XMLMetadata.java
View File

@ -47,7 +47,9 @@ public interface XMLMetadata {
*
* @return all Schema objects defined in the EdM metadata document
*/
List<? extends Schema> getSchemas();
List<Schema> getSchemas();
Map<String, Schema> getSchemaByNsOrAlias();
List<Reference> getReferences();
}

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/AnnotationExpression.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationExpression.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4.annotation;
package org.apache.olingo.client.api.edm.xml.annotation;
public interface AnnotationExpression {

2
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/AnnotationPath.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/AnnotationPath.java
View File

@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4.annotation;
package org.apache.olingo.client.api.edm.xml.annotation;
public interface AnnotationPath extends DynamicAnnotationExpression {

4
lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/v4/annotation/Apply.java → lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/annotation/Apply.java
View File

@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
package org.apache.olingo.client.api.edm.xml.v4.annotation;
package org.apache.olingo.client.api.edm.xml.annotation;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
import org.apache.olingo.client.api.edm.xml.Annotatable;
public interface Apply extends DynamicAnnotationExpression, Annotatable {

Some files were not shown because too many files have changed in this diff Show More