[OLINGO-356] Code clean up (warnings)

This commit is contained in:
Michael Bolz 2014-07-22 15:11:34 +02:00
parent 7189033192
commit 66097e3dd6
179 changed files with 137 additions and 510 deletions

View File

@ -18,12 +18,10 @@
*/
package org.apache.olingo.client.api.communication.request.batch;
import java.io.Serializable;
/**
* OData batch request factory class.
*/
public interface CommonBatchRequestFactory extends Serializable {
public interface CommonBatchRequestFactory {
/**
* Gets a batch request object instance.

View File

@ -18,6 +18,9 @@
*/
package org.apache.olingo.client.api.communication.request.cud;
import java.io.InputStream;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityCreateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataMediaEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.streamed.ODataStreamUpdateRequest;
@ -25,16 +28,12 @@ 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.io.Serializable;
import java.net.URI;
/**
* OData request factory class.
*
* @param <UT> concrete UpdateType.
*/
public interface CommonCUDRequestFactory<UT extends CommonUpdateType> extends Serializable {
public interface CommonCUDRequestFactory<UT extends CommonUpdateType> {
/**
* Gets a create request object instance.

View File

@ -18,18 +18,17 @@
*/
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 java.io.Serializable;
import java.net.URI;
import java.util.Map;
/**
* OData request factory class.
*/
public interface InvokeRequestFactory extends Serializable {
public interface InvokeRequestFactory {
/**
* Gets an invoke request instance for the operation bound to given URI.

View File

@ -20,13 +20,8 @@ package org.apache.olingo.client.api.communication.request.invoke;
import org.apache.olingo.commons.api.domain.ODataInvokeResult;
import java.io.Serializable;
/**
* Marker class for invoke with no return type.
*/
public class ODataNoContent implements Serializable, ODataInvokeResult {
private static final long serialVersionUID = 2780193571934253136L;
public class ODataNoContent implements ODataInvokeResult {
}

View File

@ -18,17 +18,16 @@
*/
package org.apache.olingo.client.api.communication.request.retrieve;
import java.net.URI;
import org.apache.olingo.commons.api.domain.CommonODataEntity;
import org.apache.olingo.commons.api.domain.CommonODataEntitySet;
import org.apache.olingo.commons.api.domain.CommonODataProperty;
import java.io.Serializable;
import java.net.URI;
/**
* OData request factory class.
*/
public interface CommonRetrieveRequestFactory extends Serializable {
public interface CommonRetrieveRequestFactory {
/**
* Gets a metadata request instance.
@ -104,7 +103,6 @@ public interface CommonRetrieveRequestFactory extends Serializable {
/**
* Gets a uri request returning a single OData entity property value.
*
* @param <T> concrete ODataProperty implementation.
* @param uri request URI.
* @return new {@link ODataValueRequest} instance.
*/

View File

@ -18,12 +18,10 @@
*/
package org.apache.olingo.client.api.uri;
import java.io.Serializable;
/**
* OData filter factory.
*/
public interface CommonFilterFactory extends Serializable {
public interface CommonFilterFactory {
CommonFilterArgFactory getArgFactory();

View File

@ -67,7 +67,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
streamDashBoundary();
final ODataChangesetResponseItem expectedResItem = new ODataChangesetResponseItem(continueOnError);
((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
((AbstractODataBatchRequest<?, ?>) req).addExpectedResItem(expectedResItem);
currentItem = new ODataChangesetImpl(req, expectedResItem);
@ -90,7 +90,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
final ODataSingleResponseItem expectedResItem = new ODataSingleResponseItem();
currentItem = new ODataSingleRequestImpl(req, expectedResItem);
((AbstractODataBatchRequest) req).addExpectedResItem(expectedResItem);
((AbstractODataBatchRequest<?, ?>) req).addExpectedResItem(expectedResItem);
((ODataSingleRequest) currentItem).setRequest(request);
}
@ -122,7 +122,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
newLine();
// stream batch-boundary
stream(("--" + ((AbstractODataBatchRequest) req).boundary).getBytes());
stream(("--" + ((AbstractODataBatchRequest<?, ?>) req).boundary).getBytes());
newLine();
}
@ -132,7 +132,7 @@ public abstract class AbstractBatchManager extends AbstractODataStreamManager<OD
protected void streamCloseDelimiter() {
// stream close-delimiter
newLine();
stream(("--" + ((AbstractODataBatchRequest) req).boundary + "--").getBytes());
stream(("--" + ((AbstractODataBatchRequest<?, ?>) req).boundary + "--").getBytes());
}
protected abstract void validateSingleRequest(ODataBatchableRequest request);

View File

@ -20,8 +20,6 @@ import org.apache.olingo.client.api.communication.request.batch.CommonBatchReque
*/
public abstract class AbstractBatchRequestFactory implements CommonBatchRequestFactory {
private static final long serialVersionUID = -3875283254713404483L;
protected final CommonODataClient<?> client;
protected AbstractBatchRequestFactory(final CommonODataClient<?> client) {

View File

@ -26,8 +26,6 @@ import org.apache.olingo.client.core.communication.request.batch.AbstractBatchRe
public class BatchRequestFactoryImpl extends AbstractBatchRequestFactory
implements BatchRequestFactory {
private static final long serialVersionUID = -6271567229804128570L;
public BatchRequestFactoryImpl(final ODataClient client) {
super(client);
}

View File

@ -18,11 +18,15 @@
*/
package org.apache.olingo.client.core.communication.request.batch.v3;
import java.io.IOException;
import java.net.URI;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.olingo.client.api.CommonODataClient;
import org.apache.olingo.client.api.communication.request.ODataBatchableRequest;
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.ODataBatchResponseItem;
import org.apache.olingo.client.api.communication.request.batch.v3.ODataBatchRequest;
@ -34,14 +38,9 @@ import org.apache.olingo.client.core.communication.request.batch.AbstractBatchMa
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 java.io.IOException;
import java.net.URI;
import java.util.Iterator;
import java.util.concurrent.TimeUnit;
public class ODataBatchRequestImpl
extends AbstractODataBatchRequest<ODataBatchResponse, BatchManager>
implements ODataBatchRequest, ODataStreamedRequest<ODataBatchResponse, BatchManager> {
public class ODataBatchRequestImpl extends AbstractODataBatchRequest<ODataBatchResponse, BatchManager>
implements ODataBatchRequest {
public ODataBatchRequestImpl(final ODataClient odataClient, final URI uri) {
super(odataClient, uri);

View File

@ -26,8 +26,6 @@ import org.apache.olingo.client.core.communication.request.batch.AbstractBatchRe
public class BatchRequestFactoryImpl extends AbstractBatchRequestFactory
implements BatchRequestFactory {
private static final long serialVersionUID = 788349446729208639L;
public BatchRequestFactoryImpl(final ODataClient client) {
super(client);
}

View File

@ -43,8 +43,6 @@ import java.net.URI;
public abstract class AbstractCUDRequestFactory<UT extends CommonUpdateType> implements CommonCUDRequestFactory<UT> {
private static final long serialVersionUID = -2723641791198745990L;
protected final CommonODataClient<?> client;
protected AbstractCUDRequestFactory(final CommonODataClient<?> client) {

View File

@ -29,10 +29,7 @@ import org.apache.olingo.commons.api.domain.ODataLink;
import java.net.URI;
public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType>
implements CUDRequestFactory {
private static final long serialVersionUID = 109196636064983035L;
public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType> implements CUDRequestFactory {
public CUDRequestFactoryImpl(final ODataClient client) {
super(client);

View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.core.communication.request.cud.v4;
import java.net.URI;
import org.apache.olingo.client.api.communication.request.cud.ODataEntityUpdateRequest;
import org.apache.olingo.client.api.communication.request.cud.v4.CUDRequestFactory;
import org.apache.olingo.client.api.communication.request.cud.v4.UpdateType;
@ -25,12 +27,7 @@ import org.apache.olingo.client.api.v4.ODataClient;
import org.apache.olingo.client.core.communication.request.cud.AbstractCUDRequestFactory;
import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
import java.net.URI;
public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType>
implements CUDRequestFactory {
private static final long serialVersionUID = 3080623853913380425L;
public class CUDRequestFactoryImpl extends AbstractCUDRequestFactory<UpdateType> implements CUDRequestFactory {
public CUDRequestFactoryImpl(final ODataClient client) {
super(client);

View File

@ -39,8 +39,6 @@ import java.util.Map;
public abstract class AbstractEdmEnabledInvokeRequestFactory extends AbstractInvokeRequestFactory
implements EdmEnabledInvokeRequestFactory {
private static final long serialVersionUID = -3637346544674184337L;
private final CommonEdmEnabledODataClient<?> edmClient;
public AbstractEdmEnabledInvokeRequestFactory(final CommonEdmEnabledODataClient<?> edmClient) {

View File

@ -35,8 +35,6 @@ import java.util.Map;
public abstract class AbstractInvokeRequestFactory implements InvokeRequestFactory {
private static final long serialVersionUID = -906760270085197249L;
@Override
public <RES extends ODataInvokeResult> ODataInvokeRequest<RES> getFunctionInvokeRequest(
final URI uri, final Class<RES> resultRef) {

View File

@ -30,8 +30,6 @@ import java.util.Map;
public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory {
private static final long serialVersionUID = 5854571629835831697L;
private final EdmEnabledODataClient edmClient;
public EdmEnabledInvokeRequestFactoryImpl(final EdmEnabledODataClient client) {

View File

@ -30,8 +30,6 @@ import java.util.Map;
public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {
private static final long serialVersionUID = -659256862901915496L;
private final ODataClient client;
public InvokeRequestFactoryImpl(final ODataClient client) {

View File

@ -30,8 +30,6 @@ import java.util.Map;
public class EdmEnabledInvokeRequestFactoryImpl extends AbstractEdmEnabledInvokeRequestFactory {
private static final long serialVersionUID = 5854571629835831697L;
private final EdmEnabledODataClient edmClient;
public EdmEnabledInvokeRequestFactoryImpl(final EdmEnabledODataClient client) {

View File

@ -30,8 +30,6 @@ import java.util.Map;
public class InvokeRequestFactoryImpl extends AbstractInvokeRequestFactory {
private static final long serialVersionUID = 8452737360003104372L;
private final ODataClient client;
public InvokeRequestFactoryImpl(final ODataClient client) {

View File

@ -32,8 +32,6 @@ import java.net.URI;
public abstract class AbstractRetrieveRequestFactory implements CommonRetrieveRequestFactory {
private static final long serialVersionUID = -111683263158803362L;
protected final CommonODataClient<?> client;
protected AbstractRetrieveRequestFactory(final CommonODataClient<?> client) {

View File

@ -37,11 +37,7 @@ import org.apache.olingo.commons.api.domain.v3.ODataProperty;
import java.net.URI;
@SuppressWarnings("unchecked")
public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory
implements RetrieveRequestFactory {
private static final long serialVersionUID = 6602745001042802479L;
public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory implements RetrieveRequestFactory {
public RetrieveRequestFactoryImpl(final ODataClient client) {
super(client);

View File

@ -38,12 +38,9 @@ import org.apache.olingo.commons.api.domain.v4.ODataSingleton;
import java.net.URI;
@SuppressWarnings("unchecked")
public class RetrieveRequestFactoryImpl extends AbstractRetrieveRequestFactory
implements RetrieveRequestFactory {
private static final long serialVersionUID = 546577958047902917L;
public RetrieveRequestFactoryImpl(final ODataClient client) {
super(client);
}

View File

@ -28,8 +28,6 @@ import org.apache.olingo.client.api.v4.ODataClient;
public class AsyncRequestFactoryImpl implements AsyncRequestFactory {
private static final long serialVersionUID = 546577958047902917L;
private final ODataClient client;
public AsyncRequestFactoryImpl(final ODataClient client) {

View File

@ -18,11 +18,17 @@
*/
package org.apache.olingo.client.core.edm;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.olingo.client.api.edm.xml.EnumType;
import org.apache.olingo.client.api.edm.xml.Member;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmEnumType;
import org.apache.olingo.commons.api.edm.EdmException;
import org.apache.olingo.commons.api.edm.EdmMember;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
@ -32,14 +38,7 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.core.edm.AbstractEdmEnumType;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public class EdmEnumTypeImpl extends AbstractEdmEnumType implements EdmEnumType {
public class EdmEnumTypeImpl extends AbstractEdmEnumType {
private static final EdmPrimitiveTypeKind[] VALID_UNDERLYING_TYPES = new EdmPrimitiveTypeKind[] {
EdmPrimitiveTypeKind.Byte,

View File

@ -18,12 +18,14 @@
*/
package org.apache.olingo.client.core.edm;
import java.util.Collections;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.CommonProperty;
import org.apache.olingo.client.api.edm.xml.v4.Property;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
import org.apache.olingo.commons.api.edm.EdmMapping;
import org.apache.olingo.commons.api.edm.EdmProperty;
import org.apache.olingo.commons.api.edm.EdmTerm;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.edm.geo.SRID;
@ -31,10 +33,7 @@ import org.apache.olingo.commons.core.edm.AbstractEdmProperty;
import org.apache.olingo.commons.core.edm.EdmAnnotationHelper;
import org.apache.olingo.commons.core.edm.EdmTypeInfo;
import java.util.Collections;
import java.util.List;
public class EdmPropertyImpl extends AbstractEdmProperty implements EdmProperty {
public class EdmPropertyImpl extends AbstractEdmProperty {
private final FullQualifiedName structuredTypeName;

View File

@ -68,9 +68,7 @@ public class EdmReturnTypeImpl extends AbstractEdmReturnType {
@Override
public SRID getSrid() {
return (returnType instanceof ReturnType)
? ((ReturnType) returnType).getSrid()
: null;
return returnType == null ? null : returnType.getSrid();
}
}

View File

@ -18,6 +18,8 @@
*/
package org.apache.olingo.client.core.edm;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.TypeDefinition;
import org.apache.olingo.commons.api.edm.Edm;
import org.apache.olingo.commons.api.edm.EdmAnnotation;
@ -25,7 +27,6 @@ import org.apache.olingo.commons.api.edm.EdmException;
import org.apache.olingo.commons.api.edm.EdmPrimitiveType;
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
import org.apache.olingo.commons.api.edm.EdmTerm;
import org.apache.olingo.commons.api.edm.EdmTypeDefinition;
import org.apache.olingo.commons.api.edm.FullQualifiedName;
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.commons.api.edm.geo.SRID;
@ -33,9 +34,7 @@ import org.apache.olingo.commons.core.edm.AbstractEdmTypeDefinition;
import org.apache.olingo.commons.core.edm.EdmAnnotationHelper;
import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeFactory;
import java.util.List;
public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition implements EdmTypeDefinition {
public class EdmTypeDefinitionImpl extends AbstractEdmTypeDefinition {
private final TypeDefinition typeDefinition;

View File

@ -30,15 +30,11 @@ import java.util.List;
public class EdmFunctionImportProxy extends EdmOperationImportImpl implements EdmFunctionImport {
private final FunctionImport functionImport;
private FullQualifiedName functionFQN;
public EdmFunctionImportProxy(final Edm edm, final EdmEntityContainer container, final String name,
final FunctionImport functionImport) {
super(edm, container, name, functionImport.getEntitySet());
this.functionImport = functionImport;
}
@Override

View File

@ -41,8 +41,6 @@ import java.util.List;
public class EdmNavigationPropertyProxy extends AbstractEdmNavigationProperty {
private final List<? extends Schema> xmlSchemas;
private final NavigationProperty navigationProperty;
private final FullQualifiedName typeFQN;
@ -61,7 +59,6 @@ public class EdmNavigationPropertyProxy extends AbstractEdmNavigationProperty {
final NavigationProperty navigationProperty) {
super(edm, navigationProperty.getName());
this.xmlSchemas = xmlSchemas;
this.navigationProperty = navigationProperty;
final FullQualifiedName relFQN = new FullQualifiedName(navigationProperty.getRelationship());

View File

@ -29,14 +29,11 @@ import java.util.List;
public class EdmRecordImpl extends AbstractEdmAnnotatableDynamicAnnotationExpression implements EdmRecord {
private final Edm edm;
private final List<EdmPropertyValue> propertyValues;
private EdmStructuredType type;
public EdmRecordImpl(final Edm edm, final String type, final List<EdmPropertyValue> propertyValues) {
this.edm = edm;
this.propertyValues = propertyValues;
if (type != null) {

View File

@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
public abstract class AbstractAnnotations extends AbstractEdmItem
implements org.apache.olingo.client.api.edm.xml.CommonAnnotations {
private static final long serialVersionUID = 4926640428016042620L;
@JsonProperty(value = "Target", required = true)
private String target;

View File

@ -26,8 +26,6 @@ import org.apache.olingo.client.api.edm.xml.ComplexType;
@JsonDeserialize(using = ComplexTypeDeserializer.class)
public abstract class AbstractComplexType extends AbstractEdmItem implements ComplexType {
private static final long serialVersionUID = -4765071294433482957L;
private String name;
@Override

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.DataServices;
@JsonDeserialize(using = DataServicesDeserializer.class)
public abstract class AbstractDataServices extends AbstractEdmItem implements DataServices {
private static final long serialVersionUID = -9126377222393876166L;
private String dataServiceVersion;
private String maxDataServiceVersion;

View File

@ -25,8 +25,6 @@ import org.apache.olingo.client.api.edm.xml.Edmx;
@JsonDeserialize(using = EdmxDeserializer.class)
public abstract class AbstractEdmx extends AbstractEdmItem implements Edmx {
private static final long serialVersionUID = -5480835122183091469L;
private String version;
private DataServices dataServices;

View File

@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = EntityContainerDeserializer.class)
public abstract class AbstractEntityContainer extends AbstractEdmItem implements EntityContainer {
private static final long serialVersionUID = 4121974387552855032L;
private String name;
private String _extends;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.EntitySet;
@JsonDeserialize(using = EntitySetDeserializer.class)
public abstract class AbstractEntitySet extends AbstractEdmItem implements EntitySet {
private static final long serialVersionUID = -6577263439520376420L;
private String name;
private String entityType;

View File

@ -25,8 +25,6 @@ import org.apache.olingo.client.api.edm.xml.EntityType;
@JsonDeserialize(using = EntityTypeDeserializer.class)
public abstract class AbstractEntityType extends AbstractComplexType implements EntityType {
private static final long serialVersionUID = -1579462552966168139L;
private boolean abstractEntityType = false;
private String baseType;

View File

@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = EnumTypeDeserializer.class)
public abstract class AbstractEnumType extends AbstractEdmItem implements EnumType {
private static final long serialVersionUID = 2688487586103418210L;
private String name;
private String underlyingType;

View File

@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.Member;
public abstract class AbstractMember extends AbstractEdmItem implements Member {
private static final long serialVersionUID = -1852481655317148552L;
@JsonProperty(value = "Name", required = true)
private String name;

View File

@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.CommonNavigationProperty;
public class AbstractNavigationProperty extends AbstractEdmItem implements CommonNavigationProperty {
private static final long serialVersionUID = 3112463683071069594L;
@JsonProperty(value = "Name", required = true)
private String name;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.CommonParameter;
@JsonDeserialize(using = ParameterDeserializer.class)
public abstract class AbstractParameter extends AbstractEdmItem implements CommonParameter {
private static final long serialVersionUID = -4305016554930334342L;
private String name;
private String type;

View File

@ -25,8 +25,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
@JsonDeserialize(using = PropertyDeserializer.class)
public abstract class AbstractProperty extends AbstractEdmItem implements CommonProperty {
private static final long serialVersionUID = -6004492361142315153L;
private String name;
private String type;

View File

@ -27,8 +27,6 @@ import org.apache.olingo.client.api.edm.xml.Schema;
@JsonDeserialize(using = SchemaDeserializer.class)
public abstract class AbstractSchema extends AbstractEdmItem implements Schema {
private static final long serialVersionUID = -1356392748971378455L;
private String namespace;
private String alias;

View File

@ -32,8 +32,6 @@ import java.util.Map;
*/
public abstract class AbstractXMLMetadata extends AbstractEdmItem implements XMLMetadata {
private static final long serialVersionUID = -1214173426671503187L;
protected final Edmx edmx;
protected final Map<String, Schema> schemaByNsOrAlias;

View File

@ -31,7 +31,6 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import java.io.IOException;
@SuppressWarnings("rawtypes")
public class EntityContainerDeserializer extends AbstractEdmDeserializer<AbstractEntityContainer> {
@Override

View File

@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = EntityKeyDeserializer.class)
public class EntityKeyImpl extends AbstractEdmItem implements EntityKey {
private static final long serialVersionUID = 2586047015894794685L;
private final List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
@Override

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.OnDeleteAction;
public class OnDeleteImpl extends AbstractEdmItem implements OnDelete {
private static final long serialVersionUID = -5321523424474336347L;
@JsonProperty(value = "Action", required = true)
private OnDeleteAction action = OnDeleteAction.None;

View File

@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.PropertyRef;
public class PropertyRefImpl extends AbstractEdmItem implements PropertyRef {
private static final long serialVersionUID = 6738212067449628983L;
@JsonProperty(value = "Name", required = true)
private String name;

View File

@ -34,7 +34,6 @@ import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import java.io.IOException;
@SuppressWarnings("rawtypes")
public class SchemaDeserializer extends AbstractEdmDeserializer<AbstractSchema> {
@Override

View File

@ -30,8 +30,6 @@ import java.util.List;
@JsonDeserialize(using = AnnotationsDeserializer.class)
public class AnnotationsImpl extends AbstractAnnotations implements Annotations {
private static final long serialVersionUID = 3877353656301805410L;
private final List<TypeAnnotation> typeAnnotations = new ArrayList<TypeAnnotation>();
private final List<ValueAnnotation> valueAnnotations = new ArrayList<ValueAnnotation>();

View File

@ -25,8 +25,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class AssociationEndImpl extends AbstractEdmItem implements AssociationEnd {
private static final long serialVersionUID = 3305394053564979376L;
@JsonProperty(value = "Type", required = true)
private String type;

View File

@ -30,8 +30,6 @@ import java.util.List;
@JsonDeserialize(using = AssociationDeserializer.class)
public class AssociationImpl extends AbstractEdmItem implements Association {
private static final long serialVersionUID = 73763231919532482L;
private String name;
private ReferentialConstraint referentialConstraint;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class AssociationSetEndImpl extends AbstractEdmItem implements AssociationSetEnd {
private static final long serialVersionUID = -6238344152962217446L;
@JsonProperty("Role")
private String role;

View File

@ -29,8 +29,6 @@ import java.util.List;
@JsonDeserialize(using = AssociationSetDeserializer.class)
public class AssociationSetImpl extends AbstractEdmItem implements AssociationSet {
private static final long serialVersionUID = 1248430921598774799L;
private String name;
private String association;

View File

@ -18,15 +18,12 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
import org.apache.olingo.client.api.edm.xml.ComplexType;
import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
import java.util.ArrayList;
import java.util.List;
public class ComplexTypeImpl extends AbstractComplexType implements ComplexType {
import org.apache.olingo.client.core.edm.xml.AbstractComplexType;
private static final long serialVersionUID = -1251230308269425962L;
public class ComplexTypeImpl extends AbstractComplexType {
private final List<PropertyImpl> properties = new ArrayList<PropertyImpl>();

View File

@ -26,8 +26,6 @@ import java.util.List;
public class DataServicesImpl extends AbstractDataServices {
private static final long serialVersionUID = 633129618050875211L;
private final List<Schema> schemas = new ArrayList<Schema>();
@Override

View File

@ -22,8 +22,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmx;
public class EdmxImpl extends AbstractEdmx {
private static final long serialVersionUID = -8031883176876401375L;
@Override
public DataServicesImpl getDataServices() {
return (DataServicesImpl) super.getDataServices();

View File

@ -28,8 +28,6 @@ import java.util.List;
public class EntityContainerImpl extends AbstractEntityContainer {
private static final long serialVersionUID = 8934431875078180370L;
private final List<EntitySet> entitySets = new ArrayList<EntitySet>();
private final List<AssociationSet> associationSets = new ArrayList<AssociationSet>();

View File

@ -21,7 +21,4 @@ package org.apache.olingo.client.core.edm.xml.v3;
import org.apache.olingo.client.core.edm.xml.AbstractEntitySet;
public class EntitySetImpl extends AbstractEntitySet {
private static final long serialVersionUID = 5570833733884884012L;
}

View File

@ -25,8 +25,6 @@ import java.util.List;
public class EntityTypeImpl extends AbstractEntityType {
private static final long serialVersionUID = 8727765036150269547L;
private final List<PropertyImpl> properties = new ArrayList<PropertyImpl>();
private final List<NavigationPropertyImpl> navigationProperties = new ArrayList<NavigationPropertyImpl>();

View File

@ -26,8 +26,6 @@ import java.util.List;
public class EnumTypeImpl extends AbstractEnumType {
private static final long serialVersionUID = 8967396195669128419L;
private final List<Member> members = new ArrayList<Member>();
@Override

View File

@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = FunctionImportDeserializer.class)
public class FunctionImportImpl implements FunctionImport {
private static final long serialVersionUID = -6214472528425935461L;
private String name;
private String returnType;

View File

@ -21,7 +21,4 @@ package org.apache.olingo.client.core.edm.xml.v3;
import org.apache.olingo.client.core.edm.xml.AbstractMember;
public class MemberImpl extends AbstractMember {
private static final long serialVersionUID = 6605381518349837929L;
}

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractNavigationProperty;
public class NavigationPropertyImpl extends AbstractNavigationProperty implements NavigationProperty {
private static final long serialVersionUID = -2889417442815563307L;
@JsonProperty(value = "Relationship", required = true)
private String relationship;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractParameter;
public class ParameterImpl extends AbstractParameter implements Parameter {
private static final long serialVersionUID = 7596724999614891358L;
private ParameterMode mode;
@Override

View File

@ -26,8 +26,6 @@ import org.apache.olingo.commons.api.edm.constants.EdmContentKind;
public class PropertyImpl extends AbstractProperty implements Property {
private static final long serialVersionUID = 6224524803474652100L;
private String collation;
private boolean fixedLength;

View File

@ -28,8 +28,6 @@ import java.util.Date;
public class PropertyValueImpl extends AbstractEdmItem implements PropertyValue {
private static final long serialVersionUID = -6580934436491418564L;
@JsonProperty(value = "Property", required = true)
private String property;

View File

@ -26,8 +26,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class ReferentialConstraintImpl extends AbstractEdmItem implements ReferentialConstraint {
private static final long serialVersionUID = 9067893732765127269L;
@JsonProperty(value = "Principal", required = true)
private ReferentialConstraintRoleImpl principal;

View File

@ -29,8 +29,6 @@ import java.util.List;
@JsonDeserialize(using = ReferentialConstraintRoleDeserializer.class)
public class ReferentialConstraintRoleImpl extends AbstractEdmItem implements ReferentialConstraintRole {
private static final long serialVersionUID = -3712887115248634164L;
private String role;
private List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();

View File

@ -18,23 +18,20 @@
*/
package org.apache.olingo.client.core.edm.xml.v3;
import java.util.ArrayList;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.ComplexType;
import org.apache.olingo.client.api.edm.xml.EntityContainer;
import org.apache.olingo.client.api.edm.xml.EntityType;
import org.apache.olingo.client.api.edm.xml.EnumType;
import org.apache.olingo.client.api.edm.xml.Schema;
import org.apache.olingo.client.api.edm.xml.v3.Annotations;
import org.apache.olingo.client.api.edm.xml.v3.Association;
import org.apache.olingo.client.api.edm.xml.v3.Using;
import org.apache.olingo.client.api.edm.xml.v3.ValueTerm;
import org.apache.olingo.client.core.edm.xml.AbstractSchema;
import java.util.ArrayList;
import java.util.List;
public class SchemaImpl extends AbstractSchema implements Schema {
private static final long serialVersionUID = 4453992249818796144L;
public class SchemaImpl extends AbstractSchema {
private final List<Annotations> annotationList = new ArrayList<Annotations>();

View File

@ -29,8 +29,6 @@ import java.util.List;
@JsonDeserialize(using = TypeAnnotationDeserializer.class)
public class TypeAnnotationImpl extends AbstractEdmItem implements TypeAnnotation {
private static final long serialVersionUID = -7585489230017331877L;
private String term;
private String qualifier;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class UsingImpl extends AbstractEdmItem implements Using {
private static final long serialVersionUID = 2086957510154443445L;
@JsonProperty(value = "Namespace", required = true)
private String namespace;

View File

@ -28,8 +28,6 @@ import java.util.Date;
public class ValueAnnotationImpl extends AbstractEdmItem implements ValueAnnotation {
private static final long serialVersionUID = -1826414005417952278L;
@JsonProperty(value = "Term", required = true)
private String term;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class ValueTermImpl extends AbstractEdmItem implements ValueTerm {
private static final long serialVersionUID = 6149019886137610604L;
@JsonProperty(value = "Name", required = true)
private String name;

View File

@ -22,8 +22,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractXMLMetadata;
public class XMLMetadataImpl extends AbstractXMLMetadata {
private static final long serialVersionUID = -7765327879691528010L;
public XMLMetadataImpl(final EdmxImpl edmx) {
super(edmx);
}

View File

@ -27,8 +27,6 @@ import java.util.List;
public abstract class AbstractAnnotatable extends AbstractEdmItem implements Annotatable {
private static final long serialVersionUID = -8859729466090997718L;
private final List<Annotation> annotations = new ArrayList<Annotation>();
@Override

View File

@ -29,8 +29,6 @@ import java.util.List;
@JsonDeserialize(using = ActionDeserializer.class)
public class ActionImpl extends AbstractAnnotatable implements Action {
private static final long serialVersionUID = -99977447455438193L;
private String name;
private boolean bound = false;

View File

@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.v4.ActionImport;
public class ActionImportImpl extends AbstractAnnotatable implements ActionImport {
private static final long serialVersionUID = -866422101558426421L;
@JsonProperty(value = "Name", required = true)
private String name;

View File

@ -25,8 +25,6 @@ import org.apache.olingo.client.api.edm.xml.v4.annotation.AnnotationExpression;
@JsonDeserialize(using = AnnotationDeserializer.class)
public class AnnotationImpl extends AbstractAnnotatable implements Annotation {
private static final long serialVersionUID = -5600031479702563436L;
private String term;
private String qualifier;

View File

@ -29,8 +29,6 @@ import java.util.List;
@JsonDeserialize(using = AnnotationsDeserializer.class)
public class AnnotationsImpl extends AbstractAnnotations implements Annotations {
private static final long serialVersionUID = 3877353656301805410L;
private final List<Annotation> annotations = new ArrayList<Annotation>();
@Override

View File

@ -29,8 +29,6 @@ import java.util.List;
public class ComplexTypeImpl extends AbstractComplexType implements ComplexType {
private static final long serialVersionUID = -1251230308269425962L;
private boolean abstractEntityType = false;
private String baseType;

View File

@ -26,8 +26,6 @@ import java.util.List;
public class DataServicesImpl extends AbstractDataServices {
private static final long serialVersionUID = -7954360771258897632L;
private final List<Schema> schemas = new ArrayList<Schema>();
@Override

View File

@ -27,8 +27,6 @@ import java.util.List;
public class EdmxImpl extends AbstractEdmx implements Edmx {
private static final long serialVersionUID = -8031883176876401375L;
private final List<Reference> references = new ArrayList<Reference>();
@Override

View File

@ -18,8 +18,10 @@
*/
package org.apache.olingo.client.core.edm.xml.v4;
import java.util.ArrayList;
import java.util.List;
import org.apache.olingo.client.api.edm.xml.v4.ActionImport;
import org.apache.olingo.client.api.edm.xml.v4.Annotatable;
import org.apache.olingo.client.api.edm.xml.v4.Annotation;
import org.apache.olingo.client.api.edm.xml.v4.EntityContainer;
import org.apache.olingo.client.api.edm.xml.v4.EntitySet;
@ -27,12 +29,7 @@ import org.apache.olingo.client.api.edm.xml.v4.FunctionImport;
import org.apache.olingo.client.api.edm.xml.v4.Singleton;
import org.apache.olingo.client.core.edm.xml.AbstractEntityContainer;
import java.util.ArrayList;
import java.util.List;
public class EntityContainerImpl extends AbstractEntityContainer implements Annotatable, EntityContainer {
private static final long serialVersionUID = 2526002525927260320L;
public class EntityContainerImpl extends AbstractEntityContainer implements EntityContainer {
private final List<EntitySet> entitySets = new ArrayList<EntitySet>();

View File

@ -28,8 +28,6 @@ import java.util.List;
public class EntitySetImpl extends AbstractEntitySet implements EntitySet {
private static final long serialVersionUID = 5570833733884884012L;
private boolean includeInServiceDocument = true;
private final List<Annotation> annotations = new ArrayList<Annotation>();

View File

@ -29,8 +29,6 @@ import java.util.List;
public class EntityTypeImpl extends AbstractEntityType implements EntityType {
private static final long serialVersionUID = 8727765036150269547L;
private final List<Property> properties = new ArrayList<Property>();
private final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();

View File

@ -27,8 +27,6 @@ import java.util.List;
public class EnumTypeImpl extends AbstractEnumType implements Annotatable {
private static final long serialVersionUID = -3329664331877556957L;
private final List<Annotation> annotations = new ArrayList<Annotation>();
@Override

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.api.edm.xml.v4.Function;
@JsonDeserialize(using = FunctionDeserializer.class)
public class FunctionImpl extends ActionImpl implements Function {
private static final long serialVersionUID = -5888231162358116515L;
private boolean composable = false;
@Override

View File

@ -28,8 +28,6 @@ import java.util.List;
@JsonDeserialize(using = FunctionImportDeserializer.class)
public class FunctionImportImpl implements FunctionImport {
private static final long serialVersionUID = 3023813358471000019L;
private String name;
private String function;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class IncludeAnnotationsImpl extends AbstractEdmItem implements IncludeAnnotations {
private static final long serialVersionUID = -5600031479702563436L;
@JsonProperty(value = "TermNamespace", required = true)
private String termNamespace;

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class IncludeImpl extends AbstractEdmItem implements Include {
private static final long serialVersionUID = -5600031479702563436L;
@JsonProperty(value = "Namespace", required = true)
private String namespace;

View File

@ -27,8 +27,6 @@ import java.util.List;
public class MemberImpl extends AbstractMember implements Annotatable {
private static final long serialVersionUID = -344920557183058824L;
private final List<Annotation> annotations = new ArrayList<Annotation>();
@Override

View File

@ -24,8 +24,6 @@ import org.apache.olingo.client.core.edm.xml.AbstractEdmItem;
public class NavigationPropertyBindingImpl extends AbstractEdmItem implements NavigationPropertyBinding {
private static final long serialVersionUID = -6026065326479176817L;
@JsonProperty(value = "Path", required = true)
private String path;

View File

@ -31,8 +31,6 @@ import java.util.List;
@JsonDeserialize(using = NavigationPropertyDeserializer.class)
public class NavigationPropertyImpl extends AbstractNavigationProperty implements NavigationProperty {
private static final long serialVersionUID = -2889417442815563307L;
private String type;
private boolean nullable = true;

View File

@ -28,8 +28,6 @@ import java.util.List;
public class ParameterImpl extends AbstractParameter implements Parameter {
private static final long serialVersionUID = -1067642515116697747L;
private SRID srid;
private final List<Annotation> annotations = new ArrayList<Annotation>();

View File

@ -27,8 +27,6 @@ import java.util.List;
public class PropertyImpl extends AbstractProperty implements Property {
private static final long serialVersionUID = -5541908235094985412L;
private final List<Annotation> annotations = new ArrayList<Annotation>();
@Override

View File

@ -30,8 +30,6 @@ import java.util.List;
@JsonDeserialize(using = ReferenceDeserializer.class)
public class ReferenceImpl extends AbstractAnnotatable implements Reference {
private static final long serialVersionUID = -5600031479702563436L;
private URI uri;
private final List<Include> includes = new ArrayList<Include>();

View File

@ -23,8 +23,6 @@ import org.apache.olingo.client.api.edm.xml.v4.ReferentialConstraint;
public class ReferentialConstraintImpl extends AbstractAnnotatable implements ReferentialConstraint {
private static final long serialVersionUID = -9182114558289778632L;
@JsonProperty(value = "Property", required = true)
private String property;

View File

@ -26,8 +26,6 @@ import org.apache.olingo.commons.api.edm.geo.SRID;
@JsonDeserialize(using = ReturnTypeDeserializer.class)
public class ReturnTypeImpl extends AbstractEdmItem implements ReturnType {
private static final long serialVersionUID = -5888231162358116515L;
private String type;
private boolean nullable = true;

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