[OLINGO-260] Delete the HttpMethods in client and use the ones in commons

This commit is contained in:
Christian Amend 2014-10-06 17:06:20 +02:00
parent d1bca47144
commit 9c60663523
292 changed files with 1056 additions and 975 deletions

View File

@ -18,13 +18,14 @@
*/
package org.apache.olingo.client.core.android.http;
import android.net.http.AndroidHttpClient;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
import java.net.URI;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.core.http.AbstractHttpClientFactory;
import org.apache.olingo.commons.api.http.HttpMethod;
import android.net.http.AndroidHttpClient;
public class AndroidHttpClientFactory extends AbstractHttpClientFactory {
@Override

View File

@ -27,10 +27,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
import org.apache.olingo.client.api.uri.URIFilter;
import org.apache.olingo.client.core.uri.URIUtils;
@ -43,6 +43,7 @@ import org.apache.olingo.commons.api.edm.EdmFunction;
import org.apache.olingo.commons.api.edm.EdmOperation;
import org.apache.olingo.commons.api.edm.EdmReturnType;
import org.apache.olingo.commons.api.edm.constants.EdmTypeKind;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.ComplexCollection;

View File

@ -19,7 +19,7 @@
package ${package};
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;

View File

@ -19,7 +19,7 @@
package ${package};
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;

View File

@ -20,7 +20,7 @@
package ${package};
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.annotations.Operation;
import org.apache.olingo.ext.proxy.api.annotations.Parameter;
import org.apache.olingo.ext.proxy.api.annotations.Property;

View File

@ -19,7 +19,7 @@
package ${package};
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;

View File

@ -19,7 +19,7 @@
package ${package};
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
import org.apache.olingo.ext.proxy.api.OperationType;
import org.apache.olingo.ext.proxy.api.annotations.Operation;

View File

@ -19,7 +19,7 @@
#set( $clsSuffix = ".class" )
package ${package};
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;

View File

@ -19,7 +19,7 @@
#set( $clsSuffix = ".class" )
package ${package};
//CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForProperty;
import org.apache.olingo.ext.proxy.api.annotations.AnnotationsForNavigationProperty;
import org.apache.olingo.ext.proxy.api.annotations.Namespace;

View File

@ -18,6 +18,23 @@
*/
package org.apache.olingo.fit.v3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
@ -29,7 +46,6 @@ 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.http.HttpMethod;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
import org.apache.olingo.client.api.v3.ODataClient;
import org.apache.olingo.client.core.ODataClientFactory;
@ -48,26 +64,10 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.fit.AbstractBaseTestITCase;
import org.junit.BeforeClass;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
public abstract class AbstractTestITCase extends AbstractBaseTestITCase {
protected static final FullQualifiedName TEST_PRODUCT_TYPE =

View File

@ -18,6 +18,15 @@
*/
package org.apache.olingo.fit.v3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URI;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
@ -25,7 +34,6 @@ import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequ
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.communication.response.ODataInvokeResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
import org.apache.olingo.client.api.v3.ODataClient;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
@ -34,17 +42,9 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.net.URI;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
/**
* This is the unit test class to check basic entity operations.
*/

View File

@ -18,6 +18,13 @@
*/
package org.apache.olingo.fit.v3;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest;
@ -30,7 +37,6 @@ import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateRe
import org.apache.olingo.client.api.communication.response.ODataRawResponse;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.uri.v3.URIBuilder;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.ODataCollectionValue;
@ -39,15 +45,9 @@ import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.junit.Test;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
/**
* This is the unit test class to check basic entity operations.
*/

View File

@ -18,6 +18,11 @@
*/
package org.apache.olingo.fit.v4;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.io.IOException;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;
@ -27,20 +32,15 @@ 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.http.HttpMethod;
import org.apache.olingo.client.api.uri.v4.URIBuilder;
import org.apache.olingo.client.api.v4.ODataClient;
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;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.junit.Test;
import java.io.IOException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
public class PropertyTestITCase extends AbstractTestITCase {
private void _enum(final ODataClient client, final ODataFormat format) {

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.api;
import java.util.concurrent.ExecutorService;
import org.apache.olingo.client.api.http.HttpClientFactory;
import org.apache.olingo.client.api.http.HttpUriRequestFactory;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.util.concurrent.ExecutorService;
/**
* Configuration wrapper.
*/

View File

@ -18,12 +18,12 @@
*/
package org.apache.olingo.client.api.communication.header;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import java.util.Arrays;
import java.util.List;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
/**
* Major OData request/response header names.
*/

View File

@ -18,12 +18,12 @@
*/
package org.apache.olingo.client.api.communication.header;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import java.util.Arrays;
import java.util.List;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
/**
* Values of the Prefer header.
*/

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.communication.request;
import java.util.concurrent.Future;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.util.concurrent.Future;
/**
* Basic OData request.
*

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.communication.request;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import java.io.InputStream;
import java.util.concurrent.Future;
import org.apache.olingo.client.api.communication.response.ODataResponse;
/**
* OData request payload management abstract class.
*

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.api.communication.request;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.http.HttpMethod;
import java.io.InputStream;
import java.net.URI;
import java.util.Collection;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Abstract representation of an OData request. Get instance by using factories.
*

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.communication.request.batch;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import java.util.Iterator;
import org.apache.olingo.client.api.communication.response.ODataResponse;
/**
* Abstract representation of a response item about a batch request.
*/

View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.client.api.communication.request.cud;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
public interface CommonUpdateType {

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.communication.request.cud.v3;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory;
import org.apache.olingo.commons.api.domain.ODataLink;
import java.net.URI;
public interface CUDRequestFactory extends CommonCUDRequestFactory<UpdateType> {
/**

View File

@ -19,7 +19,7 @@
package org.apache.olingo.client.api.communication.request.cud.v3;
import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Update type.

View File

@ -18,12 +18,12 @@
*/
package org.apache.olingo.client.api.communication.request.cud.v4;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
import java.net.URI;
public interface CUDRequestFactory extends CommonCUDRequestFactory<UpdateType> {
ODataEntityUpdateRequest<ODataSingleton> getSingletonUpdateRequest(

View File

@ -19,7 +19,7 @@
package org.apache.olingo.client.api.communication.request.cud.v4;
import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Update type.

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.api.communication.request.invoke;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import java.net.URI;
import java.util.Map;
public interface EdmEnabledInvokeRequestFactory extends InvokeRequestFactory {
/**

View File

@ -21,9 +21,9 @@ package org.apache.olingo.client.api.communication.request.invoke;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* OData request factory class.

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.api.communication.request.invoke;
import java.util.Map;
import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
import org.apache.olingo.client.api.communication.response.ODataInvokeResponse;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import java.util.Map;
/**
* This class implements an OData invoke operation request.
*

View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.api.communication.request.retrieve.v3;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest;
@ -27,8 +29,6 @@ import org.apache.olingo.commons.api.domain.v3.ODataEntity;
import org.apache.olingo.commons.api.domain.v3.ODataEntitySet;
import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import java.net.URI;
@SuppressWarnings("unchecked")
public interface RetrieveRequestFactory extends CommonRetrieveRequestFactory {

View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.api.communication.request.retrieve.v4;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntitySetIteratorRequest;
@ -28,8 +30,6 @@ import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
import org.apache.olingo.commons.api.domain.v4.ODataProperty;
import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
import java.net.URI;
@SuppressWarnings("unchecked")
public interface RetrieveRequestFactory extends CommonRetrieveRequestFactory {

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.communication.request.v4;
import java.net.URI;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.communication.response.v4.AsyncResponseWrapper;
import java.net.URI;
public interface AsyncRequestWrapper<R extends ODataResponse> {
/**

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.communication.response;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import java.util.Iterator;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
/**
* This class implements a response to a batch request.
*

View File

@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.api.communication.response;
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
import java.io.InputStream;
import java.util.Collection;
import java.util.Map;
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
/**
* Abstract representation of an OData response.
*/

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.communication.response.v4;
import java.net.URI;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import java.net.URI;
public interface AsyncResponseWrapper<R extends ODataResponse> {
/**

View File

@ -18,7 +18,7 @@
*/
package org.apache.olingo.client.api.communication.response.v4;
import org.apache.olingo.client.api.communication.response.*;
import org.apache.olingo.client.api.communication.response.ODataResponse;
/**
* This class implements the response to an OData delete request.

View File

@ -18,6 +18,15 @@
*/
package org.apache.olingo.client.api.domain;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.util.Iterator;
import java.util.NoSuchElementException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.CommonODataClient;
@ -31,15 +40,6 @@ import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.util.Iterator;
import java.util.NoSuchElementException;
/**
* OData entity set iterator class.
* <br/>

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
import org.apache.olingo.client.api.edm.xml.CommonAnnotations;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.CommonAnnotations;
public interface Annotations extends CommonAnnotations {
List<TypeAnnotation> getTypeAnnotations();

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
import org.apache.olingo.client.api.edm.xml.Named;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
public interface Association extends Named {
ReferentialConstraint getReferentialConstraint();

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
import org.apache.olingo.client.api.edm.xml.Named;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
public interface AssociationSet extends Named {
String getAssociation();

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v3;
import org.apache.olingo.client.api.edm.xml.PropertyRef;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.PropertyRef;
public interface ReferentialConstraintRole {
String getRole();

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v4;
import org.apache.olingo.client.api.edm.xml.Named;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
public interface Action extends Named, Annotatable {
boolean isBound();

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v4;
import org.apache.olingo.client.api.edm.xml.Named;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
public interface BindingTarget extends Named, Annotatable {
List<? extends NavigationPropertyBinding> getNavigationPropertyBindings();

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.edm.xml.v4;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty;
import org.apache.olingo.client.api.edm.xml.OnDelete;
import java.util.List;
public interface NavigationProperty extends CommonNavigationProperty, Annotatable {
String getType();

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.edm.xml.v4;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
import org.apache.olingo.commons.api.edm.geo.SRID;
import java.util.List;
public interface Term extends Named, Annotatable {
List<String> getAppliesTo();

View File

@ -18,11 +18,11 @@
*/
package org.apache.olingo.client.api.edm.xml.v4;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.Named;
import org.apache.olingo.commons.api.edm.geo.SRID;
import java.util.List;
public interface TypeDefinition extends Named, Annotatable {
List<Annotation> getAnnotations();

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v4.annotation;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
public interface Apply extends DynamicAnnotationExpression, Annotatable {
String getFunction();

View File

@ -18,10 +18,10 @@
*/
package org.apache.olingo.client.api.edm.xml.v4.annotation;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
public interface Record extends DynamicAnnotationExpression, Annotatable {
List<PropertyValue> getPropertyValues();

View File

@ -18,10 +18,11 @@
*/
package org.apache.olingo.client.api.http;
import org.apache.http.client.HttpClient;
import java.net.URI;
import org.apache.http.client.HttpClient;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Interface used by ODataRequest implementations to instantiate HttpClient.
*/

View File

@ -1,33 +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.client.api.http;
/**
* Supported HTTP methods.
*/
public enum HttpMethod {
GET,
POST,
PUT,
PATCH,
MERGE,
DELETE;
}

View File

@ -18,10 +18,11 @@
*/
package org.apache.olingo.client.api.http;
import org.apache.http.client.methods.HttpUriRequest;
import java.net.URI;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Interface used by ODataRequest implementations to create the HttpUriRequest.
*/

View File

@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.api.serialization;
import java.io.InputStream;
import org.apache.olingo.client.api.data.ServiceDocument;
import org.apache.olingo.client.api.edm.xml.XMLMetadata;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.serialization.ODataDeserializer;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import java.io.InputStream;
public interface ClientODataDeserializer extends ODataDeserializer {
XMLMetadata toMetadata(InputStream input);

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.api.serialization;
import java.io.InputStream;
import java.util.Map;
import org.apache.olingo.client.api.edm.xml.Schema;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
@ -29,9 +32,6 @@ import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import java.io.InputStream;
import java.util.Map;
/**
* OData reader.
* <br/>

View File

@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.api.serialization;
import java.io.InputStream;
import java.util.Collection;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import java.io.InputStream;
import java.util.Collection;
/**
* OData writer.
* <br/>

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.api.serialization.v3;
import java.io.InputStream;
import org.apache.olingo.client.api.serialization.ClientODataDeserializer;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.data.v3.LinkCollection;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import java.io.InputStream;
public interface ODataDeserializer extends ClientODataDeserializer {
/**

View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.api.serialization.v3;
import java.io.InputStream;
import org.apache.olingo.client.api.domain.v3.ODataLinkCollection;
import org.apache.olingo.client.api.serialization.CommonODataReader;
import org.apache.olingo.commons.api.domain.v3.ODataEntity;
@ -26,8 +28,6 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import java.io.InputStream;
public interface ODataReader extends CommonODataReader {
@Override

View File

@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.api.serialization.v4;
import java.io.InputStream;
import org.apache.olingo.client.api.edm.xml.v4.XMLMetadata;
import org.apache.olingo.client.api.serialization.ClientODataDeserializer;
import org.apache.olingo.commons.api.data.Delta;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import java.io.InputStream;
public interface ODataDeserializer extends ClientODataDeserializer {
@Override

View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.api.serialization.v4;
import java.io.InputStream;
import org.apache.olingo.client.api.serialization.CommonODataReader;
import org.apache.olingo.commons.api.domain.v4.ODataEntity;
import org.apache.olingo.commons.api.domain.v4.ODataEntitySet;
@ -25,8 +27,6 @@ import org.apache.olingo.commons.api.domain.v4.ODataProperty;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import java.io.InputStream;
public interface ODataReader extends CommonODataReader {
@Override

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.api.uri.v4;
import java.util.Map;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.olingo.client.api.uri.CommonURIBuilder;
import org.apache.olingo.client.api.uri.QueryOption;
import org.apache.olingo.commons.api.edm.EdmEnumType;
import java.util.Map;
public interface URIBuilder extends CommonURIBuilder<URIBuilder> {
/**

View File

@ -18,6 +18,11 @@
*/
package org.apache.olingo.client.core;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import org.apache.olingo.client.api.Configuration;
import org.apache.olingo.client.api.http.HttpClientFactory;
import org.apache.olingo.client.api.http.HttpUriRequestFactory;
@ -26,11 +31,6 @@ import org.apache.olingo.client.core.http.DefaultHttpUriRequestFactory;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
public class ConfigurationImpl implements Configuration {
private static final String DEFAULT_PUB_FORMAT = "pubFormat";

View File

@ -19,6 +19,7 @@
package org.apache.olingo.client.core.communication.header;
import java.io.InputStream;
import org.apache.http.StatusLine;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.ODataClientErrorException;

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.core.communication.header;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataHeaders;
import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataHeaders;
public class ODataHeadersImpl implements ODataHeaders {
/**

View File

@ -18,6 +18,12 @@
*/
package org.apache.olingo.client.core.communication.request;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.CommonODataClient;
@ -26,14 +32,8 @@ import org.apache.olingo.client.api.communication.request.ODataBasicRequest;
import org.apache.olingo.client.api.communication.request.ODataStreamer;
import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.concurrent.Callable;
import java.util.concurrent.Future;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Basic request abstract implementation.

View File

@ -18,6 +18,13 @@
*/
package org.apache.olingo.client.core.communication.request;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.net.URI;
import java.util.Collection;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.Header;
@ -33,16 +40,9 @@ import org.apache.olingo.client.api.communication.request.ODataRequest;
import org.apache.olingo.client.api.communication.request.ODataStreamer;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.net.URI;
import java.util.Collection;
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Abstract representation of an OData request. Get instance by using factories.

View File

@ -18,12 +18,6 @@
*/
package org.apache.olingo.client.core.communication.request;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.http.HttpClientException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PipedInputStream;
@ -33,6 +27,12 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.http.HttpClientException;
/**
* OData request payload management abstract class.
*

View File

@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.core.communication.request;
import org.apache.olingo.client.api.communication.request.ODataStreamer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.OutputStream;
import java.io.PipedOutputStream;
import org.apache.olingo.client.api.communication.request.ODataStreamer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Streamer utility object.
*/

View File

@ -15,6 +15,8 @@
*/
package org.apache.olingo.client.core.communication.request;
import java.io.IOException;
import org.apache.http.HttpResponse;
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
@ -23,7 +25,6 @@ import org.apache.olingo.client.core.communication.header.ODataErrorResponseChec
import org.apache.olingo.commons.api.ODataRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
public abstract class AbstractRequest {

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.core.communication.request.batch;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import org.apache.http.HttpResponse;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
@ -27,8 +30,6 @@ import org.apache.olingo.client.api.communication.request.batch.ODataSingleReque
import org.apache.olingo.client.api.communication.response.ODataBatchResponse;
import org.apache.olingo.client.core.communication.request.AbstractODataStreamManager;
import org.apache.olingo.client.core.communication.request.Wrapper;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
/**
* Batch request payload management.

View File

@ -18,21 +18,21 @@
*/
package org.apache.olingo.client.core.communication.request.batch;
import java.io.PipedOutputStream;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.request.ODataPayloadManager;
import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.streamed.AbstractODataStreamedRequest;
import org.apache.olingo.commons.api.format.ContentType;
import java.io.PipedOutputStream;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* This class implements a batch request.

View File

@ -18,16 +18,16 @@
*/
package org.apache.olingo.client.core.communication.request.batch;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
/**
* Abstract representation of a response item about a batch request.
*/

View File

@ -18,18 +18,6 @@
*/
package org.apache.olingo.client.core.communication.request.batch;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.ODataStreamer;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.format.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@ -42,6 +30,18 @@ import java.util.TreeMap;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.LineIterator;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.ODataStreamer;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchLineIterator;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.format.ContentType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Utility class for batch requests and responses.
*/

View File

@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.core.communication.request.batch;
import java.util.UUID;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataChangeset;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataRequest;
import org.apache.olingo.commons.api.format.ContentType;
import java.util.UUID;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Changeset wrapper for the corresponding batch item.

View File

@ -18,13 +18,14 @@
*/
package org.apache.olingo.client.core.communication.request.batch;
import java.util.Collection;
import java.util.Map;
import java.util.NoSuchElementException;
import org.apache.olingo.client.api.ODataBatchConstants;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.core.communication.response.batch.ODataBatchErrorResponse;
import org.apache.olingo.client.core.communication.response.v4.AsyncResponseImpl;
import java.util.Collection;
import java.util.Map;
import java.util.NoSuchElementException;
/**
* Changeset wrapper for the corresponding batch item.

View File

@ -21,8 +21,8 @@ package org.apache.olingo.client.core.communication.request.batch;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
import org.apache.olingo.client.api.communication.request.batch.CommonODataBatchRequest;
import org.apache.olingo.client.api.communication.request.batch.ODataSingleRequest;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataRequest;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* Retrieve request wrapper for the corresponding batch item.

View File

@ -18,14 +18,14 @@
*/
package org.apache.olingo.client.core.communication.request.batch;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.core.communication.response.batch.ODataBatchErrorResponse;
import org.apache.olingo.client.core.communication.response.v4.AsyncResponseImpl;
import java.util.Collection;
import java.util.Map;
import java.util.NoSuchElementException;
import org.apache.olingo.client.api.communication.response.ODataResponse;
import org.apache.olingo.client.core.communication.response.batch.ODataBatchErrorResponse;
import org.apache.olingo.client.core.communication.response.v4.AsyncResponseImpl;
/**
* Retrieve response wrapper for the corresponding batch item.
*/

View File

@ -31,13 +31,13 @@ import org.apache.olingo.client.api.communication.request.batch.BatchManager;
import org.apache.olingo.client.api.communication.request.batch.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.request.batch.v3.ODataBatchRequest;
import org.apache.olingo.client.api.communication.response.ODataBatchResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.v3.ODataClient;
import org.apache.olingo.client.core.communication.request.AbstractODataRequest;
import org.apache.olingo.client.core.communication.request.batch.AbstractBatchManager;
import org.apache.olingo.client.core.communication.request.batch.AbstractODataBatchRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.communication.response.batch.ODataBatchResponseManager;
import org.apache.olingo.commons.api.http.HttpMethod;
public class ODataBatchRequestImpl extends AbstractODataBatchRequest<ODataBatchResponse, BatchManager>
implements ODataBatchRequest {

View File

@ -22,6 +22,7 @@ import java.io.IOException;
import java.net.URI;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.CommonODataClient;

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.core.communication.request.cud;
import java.io.InputStream;
import java.net.URI;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.CommonCUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.CommonUpdateType;
@ -29,7 +32,6 @@ import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRe
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.streamed.ODataMediaEntityCreateRequestImpl;
import org.apache.olingo.client.core.communication.request.streamed.ODataMediaEntityUpdateRequestImpl;
import org.apache.olingo.client.core.communication.request.streamed.ODataStreamUpdateRequestImpl;
@ -37,9 +39,7 @@ import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
import java.io.InputStream;
import java.net.URI;
import org.apache.olingo.commons.api.http.HttpMethod;
public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> implements CommonCUDRequestFactory<UT> {

View File

@ -18,18 +18,18 @@
*/
package org.apache.olingo.client.core.communication.request.cud;
import java.io.InputStream;
import java.net.URI;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataDeleteRequest;
import org.apache.olingo.client.api.communication.response.ODataDeleteResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.io.InputStream;
import java.net.URI;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* This class implements an OData delete request.

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.core.communication.request.cud;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -25,7 +28,6 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityCreateRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityCreateResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
@ -33,12 +35,10 @@ import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import java.io.InputStream;
import java.net.URI;
/**
* This class implements an OData create request.
*

View File

@ -18,14 +18,17 @@
*/
package org.apache.olingo.client.core.communication.request.cud;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.HttpStatus;
import org.apache.http.client.HttpClient;
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.response.ODataEntityUpdateResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
@ -33,13 +36,10 @@ import org.apache.olingo.commons.api.data.Entity;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import java.io.InputStream;
import java.net.URI;
import org.apache.http.HttpStatus;
/**
* This class implements an OData update request.
*

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.core.communication.request.cud;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -25,7 +28,6 @@ import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataPropertyUpdateRequest;
import org.apache.olingo.client.api.communication.response.ODataPropertyUpdateResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
@ -33,12 +35,10 @@ import org.apache.olingo.commons.api.data.Property;
import org.apache.olingo.commons.api.data.ResWrap;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import java.io.InputStream;
import java.net.URI;
/**
* This class implements an OData update entity property request.
*/

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.core.communication.request.cud;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -26,16 +29,13 @@ import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.ODataValueUpdateRequest;
import org.apache.olingo.client.api.communication.response.ODataValueUpdateResponse;
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.ODataPrimitiveValue;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.io.InputStream;
import java.net.URI;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* This class implements an OData update entity property value request.

View File

@ -18,16 +18,16 @@
*/
package org.apache.olingo.client.core.communication.request.cud.v3;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.cud.v3.CUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkCreateRequest;
import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.v3.ODataClient;
import org.apache.olingo.client.core.communication.request.cud.AbstractCUDRequestFactory;
import org.apache.olingo.commons.api.domain.ODataLink;
import java.net.URI;
import org.apache.olingo.commons.api.http.HttpMethod;
public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType> implements CUDRequestFactory {

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.core.communication.request.cud.v3;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -25,17 +28,14 @@ import org.apache.http.client.methods.HttpPost;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkCreateRequest;
import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import java.io.InputStream;
import java.net.URI;
/**
* This class implements an insert link OData request.
*/

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.core.communication.request.cud.v3;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -25,17 +28,14 @@ import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.cud.v3.ODataLinkUpdateRequest;
import org.apache.olingo.client.api.communication.response.ODataLinkOperationResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.client.core.uri.URIUtils;
import org.apache.olingo.commons.api.domain.ODataLink;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import java.io.InputStream;
import java.net.URI;
/**
* This class implements an update link OData request.
*/

View File

@ -24,10 +24,10 @@ import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateR
import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFactory;
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.http.HttpMethod;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.communication.request.cud.AbstractCUDRequestFactory;
import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
import org.apache.olingo.commons.api.http.HttpMethod;
public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType> implements CUDRequestFactory {

View File

@ -19,20 +19,20 @@
package org.apache.olingo.client.core.communication.request.cud.v4;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.io.InputStream;
import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.olingo.client.api.communication.request.cud.v4.ODataReferenceAddingRequest;
import org.apache.olingo.client.api.communication.response.v4.ODataReferenceAddingResponse;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import org.apache.olingo.commons.api.Constants;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* This class implements an OData delete request.

View File

@ -18,10 +18,13 @@
*/
package org.apache.olingo.client.core.communication.request.invoke;
import java.net.URI;
import java.util.ArrayList;
import java.util.Map;
import org.apache.olingo.client.api.CommonEdmEnabledODataClient;
import org.apache.olingo.client.api.communication.request.invoke.EdmEnabledInvokeRequestFactory;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.edm.EdmAction;
@ -31,10 +34,7 @@ import org.apache.olingo.commons.api.edm.EdmFunction;
import org.apache.olingo.commons.api.edm.EdmFunctionImport;
import org.apache.olingo.commons.api.edm.EdmSchema;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import java.net.URI;
import java.util.ArrayList;
import java.util.Map;
import org.apache.olingo.commons.api.http.HttpMethod;
public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInvokeRequestFactory
implements EdmEnabledInvokeRequestFactory {

View File

@ -18,10 +18,12 @@
*/
package org.apache.olingo.client.core.communication.request.invoke;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.client.api.communication.request.invoke.InvokeRequestFactory;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
@ -29,9 +31,7 @@ import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.edm.EdmReturnType;
import org.apache.olingo.commons.api.edm.constants.EdmTypeKind;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.commons.api.http.HttpMethod;
public abstract class AbstractInvokeRequestFactory implements InvokeRequestFactory {

View File

@ -18,6 +18,12 @@
*/
package org.apache.olingo.client.core.communication.request.invoke;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.LinkedHashMap;
import java.util.Map;
import org.apache.commons.io.IOUtils;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
@ -29,7 +35,6 @@ import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequ
import org.apache.olingo.client.api.communication.request.invoke.ODataNoContent;
import org.apache.olingo.client.api.communication.response.ODataInvokeResponse;
import org.apache.olingo.client.api.http.HttpClientException;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
@ -40,15 +45,10 @@ import org.apache.olingo.commons.api.domain.CommonODataProperty;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import org.apache.olingo.commons.api.format.ODataFormat;
import org.apache.olingo.commons.api.http.HttpMethod;
import org.apache.olingo.commons.api.serialization.ODataDeserializerException;
import org.apache.olingo.commons.api.serialization.ODataSerializerException;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* This class implements an OData invoke operation request.
*/

View File

@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.core.communication.request.invoke.v3;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.v3.EdmEnabledODataClient;
import org.apache.olingo.client.core.communication.request.invoke.AbstractEdmEnabledInvokeRequestFactory;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.commons.api.http.HttpMethod;
public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory {

View File

@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.core.communication.request.invoke.v3;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.v3.ODataClient;
import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.commons.api.http.HttpMethod;
public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.core.communication.request.invoke.v3;
import java.net.URI;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.invoke.AbstractODataInvokeRequest;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.net.URI;
import org.apache.olingo.commons.api.http.HttpMethod;
public class ODataInvokeRequestImpl<T extends ODataInvokeResult> extends AbstractODataInvokeRequest<T> {

View File

@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.core.communication.request.invoke.v4;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.v4.EdmEnabledODataClient;
import org.apache.olingo.client.core.communication.request.invoke.AbstractEdmEnabledInvokeRequestFactory;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.commons.api.http.HttpMethod;
public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory {

View File

@ -18,15 +18,15 @@
*/
package org.apache.olingo.client.core.communication.request.invoke.v4;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.client.api.communication.request.invoke.ODataInvokeRequest;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.communication.request.invoke.AbstractInvokeRequestFactory;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.domain.ODataValue;
import java.net.URI;
import java.util.Map;
import org.apache.olingo.commons.api.http.HttpMethod;
public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {

View File

@ -18,12 +18,13 @@
*/
package org.apache.olingo.client.core.communication.request.invoke.v4;
import java.net.URI;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.invoke.AbstractODataInvokeRequest;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.net.URI;
import org.apache.olingo.commons.api.http.HttpMethod;
public class ODataInvokeRequestImpl<T extends ODataInvokeResult> extends AbstractODataInvokeRequest<T> {

View File

@ -18,13 +18,13 @@
*/
package org.apache.olingo.client.core.communication.request.retrieve;
import java.net.URI;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.ODataRequest;
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.commons.api.format.ODataFormat;
import java.net.URI;
public abstract class AbstractMetadataRequestImpl<V> extends AbstractODataRetrieveRequest<V> {
public AbstractMetadataRequestImpl(final CommonODataClient<?> odataClient, final URI query) {

View File

@ -18,17 +18,17 @@
*/
package org.apache.olingo.client.core.communication.request.retrieve;
import java.io.InputStream;
import java.net.URI;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.ODataRetrieveRequest;
import org.apache.olingo.client.api.communication.response.ODataRetrieveResponse;
import org.apache.olingo.client.api.http.HttpMethod;
import org.apache.olingo.client.core.communication.request.AbstractODataBasicRequest;
import org.apache.olingo.client.core.communication.response.AbstractODataResponse;
import java.io.InputStream;
import java.net.URI;
import org.apache.olingo.commons.api.http.HttpMethod;
/**
* This is an abstract representation of an OData retrieve query request returning one or more result item.

View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.core.communication.request.retrieve;
import java.net.URI;
import org.apache.commons.lang3.StringUtils;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.CommonRetrieveRequestFactory;
@ -28,8 +30,6 @@ import org.apache.olingo.client.api.communication.request.retrieve.ODataServiceD
import org.apache.olingo.client.api.communication.request.retrieve.ODataValueRequest;
import org.apache.olingo.client.core.uri.URIUtils;
import java.net.URI;
public abstract class AbstractRetrieveRequestFactory implements CommonRetrieveRequestFactory {
protected final CommonODataClient<?> client;

View File

@ -19,6 +19,7 @@
package org.apache.olingo.client.core.communication.request.retrieve;
import java.net.URI;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.retrieve.EdmMetadataRequest;

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