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

Ensuring the build does not warn under JDK 6

This commit is contained in:
Francesco Chicchiriccò 2014-04-16 09:09:13 +02:00
parent 39eb821258
commit 47f1ec1801
18 changed files with 42 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/client-api/src/main/java/org/apache/olingo/client/api/communication/request/retrieve/ODataEntityRequest.java
View File

@ -24,5 +24,5 @@ import org.apache.olingo.commons.api.format.ODataPubFormat;
/**
* This class implements an OData retrieve query request returning a single entity.
*/
public interface ODataEntityRequest<T extends CommonODataEntity> extends ODataRetrieveRequest<T, ODataPubFormat> {
public interface ODataEntityRequest<E extends CommonODataEntity> extends ODataRetrieveRequest<E, ODataPubFormat> {
}

1
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/ODataRequestImpl.java
View File

@ -38,7 +38,6 @@ import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.ODataServerErrorException;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataHeaders;
import org.apache.olingo.client.api.communication.header.ODataPreferences;
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;

11
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/AbstractODataRetrieveRequest.java
View File

@ -44,7 +44,9 @@ public abstract class AbstractODataRetrieveRequest<V, T extends Format>
* @param formatRef reference class for the format being used
* @param query query to be executed.
*/
public AbstractODataRetrieveRequest(final CommonODataClient odataClient, final Class<T> formatRef, final URI query) {
public AbstractODataRetrieveRequest(final CommonODataClient<?> odataClient, final Class<T> formatRef,
final URI query) {
super(odataClient, formatRef, HttpMethod.GET, query);
}
@ -67,14 +69,15 @@ public abstract class AbstractODataRetrieveRequest<V, T extends Format>
/**
* Response abstract class about an ODataRetrieveRequest.
*/
protected abstract class ODataRetrieveResponseImpl extends AbstractODataResponse implements ODataRetrieveResponse<V> {
protected abstract class AbstractODataRetrieveResponse
extends AbstractODataResponse implements ODataRetrieveResponse<V> {
/**
* Constructor.
* <p>
* Just to create response templates to be initialized from batch.
*/
protected ODataRetrieveResponseImpl() {
protected AbstractODataRetrieveResponse() {
super();
}
@ -84,7 +87,7 @@ public abstract class AbstractODataRetrieveRequest<V, T extends Format>
* @param client HTTP client.
* @param res HTTP response.
*/
protected ODataRetrieveResponseImpl(final HttpClient client, final HttpResponse res) {
protected AbstractODataRetrieveResponse(final HttpClient client, final HttpResponse res) {
super(client, res);
}

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/EdmMetadataRequestImpl.java
View File

@ -49,7 +49,7 @@ class EdmMetadataRequestImpl extends AbstractMetadataRequestImpl<Edm> implements
final ODataRetrieveResponse<List<? extends Schema>> xmlMetadataResponse =
odataClient.getRetrieveRequestFactory().getXMLMetadataRequest(serviceRoot).execute();
return new ODataRetrieveResponseImpl() {
return new AbstractODataRetrieveResponse() {
private Edm metadata = null;
@Override

25
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntityRequestImpl.java
View File

@ -32,8 +32,8 @@ import org.apache.olingo.commons.api.format.ODataPubFormat;
/**
* This class implements an OData retrieve query request returning a single entity.
*/
public class ODataEntityRequestImpl<T extends CommonODataEntity>
extends AbstractODataRetrieveRequest<T, ODataPubFormat> implements ODataEntityRequest<T> {
public class ODataEntityRequestImpl<E extends CommonODataEntity>
extends AbstractODataRetrieveRequest<E, ODataPubFormat> implements ODataEntityRequest<E> {
/**
* Private constructor.
@ -41,31 +41,29 @@ public class ODataEntityRequestImpl<T extends CommonODataEntity>
* @param odataClient client instance getting this request
* @param query query to be executed.
*/
public ODataEntityRequestImpl(final CommonODataClient odataClient, final URI query) {
public ODataEntityRequestImpl(final CommonODataClient<?> odataClient, final URI query) {
super(odataClient, ODataPubFormat.class, query);
}
/**
* {@inheritDoc }
*/
@Override
public ODataRetrieveResponse<T> execute() {
public ODataRetrieveResponse<E> execute() {
return new ODataEntityResponseImpl(httpClient, doExecute());
}
/**
* Response class about an ODataEntityRequest.
*/
public class ODataEntityResponseImpl extends ODataRetrieveResponseImpl {
public class ODataEntityResponseImpl extends AbstractODataRetrieveResponse {
private T entity = null;
private E entity = null;
/**
* Constructor.
* <p>
* <br/>
* Just to create response templates to be initialized from batch.
*/
private ODataEntityResponseImpl() {
super();
}
/**
@ -78,18 +76,15 @@ public class ODataEntityRequestImpl<T extends CommonODataEntity>
super(client, res);
}
/**
* {@inheritDoc }
*/
@Override
@SuppressWarnings("unchecked")
public T getBody() {
public E getBody() {
if (entity == null) {
try {
final Container<Entry> container =
odataClient.getDeserializer().toEntry(getRawResponse(), ODataPubFormat.fromString(getContentType()));
entity = (T) odataClient.getBinder().getODataEntity(extractFromContainer(container));
entity = (E) odataClient.getBinder().getODataEntity(extractFromContainer(container));
} finally {
this.close();
}

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetIteratorRequestImpl.java
View File

@ -60,7 +60,7 @@ public class ODataEntitySetIteratorRequestImpl<ES extends CommonODataEntitySet,
/**
* Response class about an ODataEntitySetIteratorRequest.
*/
protected class ODataEntitySetIteratorResponseImpl extends ODataRetrieveResponseImpl {
protected class ODataEntitySetIteratorResponseImpl extends AbstractODataRetrieveResponse {
/**
* Constructor.

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataEntitySetRequestImpl.java
View File

@ -61,7 +61,7 @@ public class ODataEntitySetRequestImpl<ES extends CommonODataEntitySet>
/**
* Response class about an ODataEntitySetRequest.
*/
protected class ODataEntitySetResponseImpl extends ODataRetrieveResponseImpl {
protected class ODataEntitySetResponseImpl extends AbstractODataRetrieveResponse {
/**
* Constructor.

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataMediaRequestImpl.java
View File

@ -65,7 +65,7 @@ public class ODataMediaRequestImpl extends AbstractODataRetrieveRequest<InputStr
/**
* Response class about an ODataMediaRequest.
*/
protected class ODataMediaResponseImpl extends ODataRetrieveResponseImpl {
protected class ODataMediaResponseImpl extends AbstractODataRetrieveResponse {
private InputStream input = null;

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataPropertyRequestImpl.java
View File

@ -56,7 +56,7 @@ public class ODataPropertyRequestImpl<T extends CommonODataProperty>
return new ODataPropertyResponseImpl(httpClient, res);
}
protected class ODataPropertyResponseImpl extends ODataRetrieveResponseImpl {
protected class ODataPropertyResponseImpl extends AbstractODataRetrieveResponse {
private T property = null;

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataServiceDocumentRequestImpl.java
View File

@ -57,7 +57,7 @@ public class ODataServiceDocumentRequestImpl extends AbstractODataRetrieveReques
/**
* Response class about an ODataServiceDocumentRequest.
*/
protected class ODataServiceResponseImpl extends ODataRetrieveResponseImpl {
protected class ODataServiceResponseImpl extends AbstractODataRetrieveResponse {
private ODataServiceDocument serviceDocument = null;

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/ODataValueRequestImpl.java
View File

@ -58,7 +58,7 @@ public class ODataValueRequestImpl extends AbstractODataRetrieveRequest<ODataPri
/**
* Response class about an ODataDeleteReODataValueRequestquest.
*/
protected class ODataValueResponseImpl extends ODataRetrieveResponseImpl {
protected class ODataValueResponseImpl extends AbstractODataRetrieveResponse {
private ODataPrimitiveValue value = null;

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/ODataLinkCollectionRequestImpl.java
View File

@ -56,7 +56,7 @@ public class ODataLinkCollectionRequestImpl extends AbstractODataRetrieveRequest
return new ODataLinkCollectionResponseImpl(httpClient, doExecute());
}
protected class ODataLinkCollectionResponseImpl extends ODataRetrieveResponseImpl {
protected class ODataLinkCollectionResponseImpl extends AbstractODataRetrieveResponse {
private ODataLinkCollection links = null;

2
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v3/XMLMetadataRequestImpl.java
View File

@ -41,7 +41,7 @@ public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl<List<? e
return new XMLMetadataResponseImpl(httpClient, doExecute());
}
public class XMLMetadataResponseImpl extends ODataRetrieveResponseImpl {
public class XMLMetadataResponseImpl extends AbstractODataRetrieveResponse {
private XMLMetadata metadata = null;

4
lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/v4/XMLMetadataRequestImpl.java
View File

@ -77,7 +77,7 @@ public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl<List<? e
@Override
public ODataRetrieveResponse<XMLMetadata> execute() {
return new ODataRetrieveResponseImpl(httpClient, doExecute()) {
return new AbstractODataRetrieveResponse(httpClient, doExecute()) {
@Override
public XMLMetadata getBody() {
@ -91,7 +91,7 @@ public class XMLMetadataRequestImpl extends AbstractMetadataRequestImpl<List<? e
}
}
public class XMLMetadataResponseImpl extends ODataRetrieveResponseImpl {
public class XMLMetadataResponseImpl extends AbstractODataRetrieveResponse {
private final List<Schema> schemas = new ArrayList<Schema>();

23
lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/BatchTestITCase.java
View File

@ -60,11 +60,11 @@ import org.junit.Test;
public class BatchTestITCase extends AbstractTestITCase {
private static String PREFIX = "!!PREFIX!!";
private static final String PREFIX = "!!PREFIX!!";
private static String SUFFIX = "!!SUFFIX!!";
private static final String SUFFIX = "!!SUFFIX!!";
private static int MAX = 10000;
private static final int MAX = 10000;
@Test
public void stringStreaming() {
@ -78,7 +78,7 @@ public class BatchTestITCase extends AbstractTestITCase {
streaming.addObject((i + ") send info\n").getBytes());
}
streaming.addObject((SUFFIX).getBytes());
streaming.addObject(SUFFIX.getBytes());
streaming.finalizeBody();
}
@ -304,7 +304,7 @@ public class BatchTestITCase extends AbstractTestITCase {
assertEquals(202, response.getStatusCode());
assertEquals("Accepted", response.getStatusMessage());
final Iterator<ODataBatchResponseItem> iter = response.getBody();
// retrive the first item (ODataRetrieve)
ODataBatchResponseItem item = iter.next();
assertTrue(item instanceof ODataRetrieveResponseItem);
@ -315,10 +315,11 @@ public class BatchTestITCase extends AbstractTestITCase {
assertEquals(200, res.getStatusCode());
assertEquals("OK", res.getStatusMessage());
ODataEntityResponseImpl entres = (ODataEntityResponseImpl) res;
ODataEntity entity = (ODataEntity)entres.getBody();
assertEquals(new Integer(-10), entity.getProperty("CustomerId").getPrimitiveValue().toCastValue(Integer.class));
ODataEntityRequestImpl<ODataEntity>.ODataEntityResponseImpl entres =
(ODataEntityRequestImpl.ODataEntityResponseImpl) res;
ODataEntity entity = entres.getBody();
assertEquals(-10, entity.getProperty("CustomerId").getPrimitiveValue().toCastValue(Integer.class), 0);
// retrieve the second item (ODataChangeset)
item = iter.next();
@ -349,8 +350,8 @@ public class BatchTestITCase extends AbstractTestITCase {
assertEquals(200, res.getStatusCode());
assertEquals("OK", res.getStatusMessage());
entres = (ODataEntityResponseImpl) res;
entity = (ODataEntity)entres.getBody();
entres = (ODataEntityRequestImpl.ODataEntityResponseImpl) res;
entity = entres.getBody();
assertEquals("new description from batch",
entity.getProperty("Description").getPrimitiveValue().toCastValue(String.class));

1
lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityCreateTestITCase.java
View File

@ -30,7 +30,6 @@ import java.util.LinkedHashMap;
import java.util.Set;
import org.apache.http.entity.ContentType;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataPreferences;
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.v3.UpdateType;

1
lib/client-core/src/test/java/org/apache/olingo/client/core/it/v3/EntityUpdateTestITCase.java
View File

@ -26,7 +26,6 @@ import java.net.URI;
import java.util.LinkedHashMap;
import org.apache.olingo.client.api.communication.ODataClientErrorException;
import org.apache.olingo.client.api.communication.header.HeaderName;
import org.apache.olingo.client.api.communication.header.ODataPreferences;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v3.UpdateType;
import org.apache.olingo.client.api.communication.request.retrieve.ODataEntityRequest;

2
pom.xml
View File

@ -70,7 +70,7 @@
<commons.logging.version>1.1.3</commons.logging.version>
<commons.vfs.version>2.0</commons.vfs.version>
<esigate.version>4.3</esigate.version>
<servlet.version>3.1.0</servlet.version>
<servlet.version>3.0.1</servlet.version>
<cxf.version>2.7.11</cxf.version>
<spring.version>4.0.3.RELEASE</spring.version>