You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by mi...@apache.org on 2015/03/10 09:53:43 UTC
olingo-odata4 git commit: [OLINGO-575] Minor code clean up
Repository: olingo-odata4
Updated Branches:
refs/heads/master e1997e8e0 -> fadb6c861
[OLINGO-575] Minor code clean up
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/fadb6c86
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/fadb6c86
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/fadb6c86
Branch: refs/heads/master
Commit: fadb6c861e64c910cc00594d9be91a8a03d2bad3
Parents: e1997e8
Author: Michael Bolz <mi...@sap.com>
Authored: Tue Mar 10 09:47:57 2015 +0100
Committer: Michael Bolz <mi...@sap.com>
Committed: Tue Mar 10 09:47:57 2015 +0100
----------------------------------------------------------------------
fit/pom.xml | 54 ++++++++++----------
.../fit/tecsvc/client/FunctionImportITCase.java | 26 ++++++++++
.../client/api/edm/xml/OnDeleteAction.java | 2 +-
.../retrieve/XMLMetadataRequestImpl.java | 2 +-
.../data/JSONServiceDocumentDeserializer.java | 2 +-
.../core/edm/EdmStructuredTypeHelperImpl.java | 16 +-----
.../client/core/edm/xml/EnumTypeImpl.java | 2 +-
.../core/serialization/ODataBinderImpl.java | 7 ++-
.../olingo/client/core/uri/URIBuilderImpl.java | 7 ++-
.../apache/olingo/client/core/uri/URIUtils.java | 4 +-
.../olingo/commons/api/data/DeletedEntity.java | 2 +-
.../commons/api/domain/ODataDeletedEntity.java | 2 +-
.../commons/api/edm/EdmPrimitiveTypeKind.java | 3 +-
.../api/edm/constants/EdmContentKind.java | 2 +-
.../commons/api/edm/constants/EdmOnDelete.java | 2 +-
.../commons/api/edm/constants/EdmTypeKind.java | 2 +-
.../olingo/commons/api/edm/geo/Geospatial.java | 4 +-
.../olingo/commons/api/http/HttpMethod.java | 2 +-
.../core/edm/primitivetype/EdmDecimal.java | 5 +-
.../core/edm/primitivetype/EdmDouble.java | 2 +-
.../core/edm/primitivetype/EdmSingle.java | 4 +-
.../core/serialization/AtomDeserializer.java | 2 +-
.../serialization/JsonEntityDeserializer.java | 2 +-
.../serialization/JsonEntitySetSerializer.java | 2 +-
.../serialization/JsonPropertyDeserializer.java | 2 +-
.../api/serializer/EntitySerializerOptions.java | 2 +-
.../olingo/server/api/uri/UriInfoKind.java | 2 +-
.../server/core/ODataExceptionHelper.java | 3 +-
.../FixedFormatDeserializerImpl.java | 2 +-
.../core/edm/provider/EdmComplexTypeImpl.java | 3 +-
.../core/edm/provider/EdmEntityTypeImpl.java | 3 +-
.../serializer/BatchResponseSerializer.java | 4 +-
.../core/uri/UriResourceLambdaAllImpl.java | 4 --
.../core/uri/UriResourceLambdaAnyImpl.java | 4 +-
.../olingo/server/core/uri/parser/Parser.java | 22 ++------
.../server/core/uri/parser/UriDecoder.java | 1 -
.../core/uri/parser/UriParseTreeVisitor.java | 12 ++---
.../expression/operand/TypedOperand.java | 2 +-
.../core/uri/testutil/ExpandValidator.java | 3 +-
.../core/uri/testutil/FilterTreeToText.java | 6 +--
.../core/uri/testutil/ParseTreeToText.java | 3 +-
41 files changed, 108 insertions(+), 128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/fit/pom.xml
----------------------------------------------------------------------
diff --git a/fit/pom.xml b/fit/pom.xml
index 565916d..9f0a1f9 100644
--- a/fit/pom.xml
+++ b/fit/pom.xml
@@ -196,33 +196,33 @@
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-invoker-plugin</artifactId>
- <inherited>true</inherited>
- <configuration>
- <debug>true</debug>
- <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <postBuildHookScript>verify</postBuildHookScript>
- <goals>
- <goal>clean</goal>
- <goal>test-compile</goal>
- </goals>
- </configuration>
- <executions>
- <execution>
- <id>pojogen-integration-test</id>
- <phase>integration-test</phase>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <!--<plugin>-->
+ <!--<groupId>org.apache.maven.plugins</groupId>-->
+ <!--<artifactId>maven-invoker-plugin</artifactId>-->
+ <!--<inherited>true</inherited>-->
+ <!--<configuration>-->
+ <!--<debug>true</debug>-->
+ <!--<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>-->
+ <!--<pomIncludes>-->
+ <!--<pomInclude>*/pom.xml</pomInclude>-->
+ <!--</pomIncludes>-->
+ <!--<postBuildHookScript>verify</postBuildHookScript>-->
+ <!--<goals>-->
+ <!--<goal>clean</goal>-->
+ <!--<goal>test-compile</goal>-->
+ <!--</goals>-->
+ <!--</configuration>-->
+ <!--<executions>-->
+ <!--<execution>-->
+ <!--<id>pojogen-integration-test</id>-->
+ <!--<phase>integration-test</phase>-->
+ <!--<goals>-->
+ <!--<goal>integration-test</goal>-->
+ <!--<goal>verify</goal>-->
+ <!--</goals>-->
+ <!--</execution>-->
+ <!--</executions>-->
+ <!--</plugin>-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
----------------------------------------------------------------------
diff --git a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
index b2d5738..6dc904a 100644
--- a/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/tecsvc/client/FunctionImportITCase.java
@@ -90,6 +90,32 @@ public class FunctionImportITCase extends AbstractBaseTestITCase {
}
+// @Test
+// public void entityCollection22() {
+// final ODataInvokeRequest<ODataEntitySet> request = getClient().getInvokeRequestFactory()
+// .getFunctionInvokeRequest(getClient().newURIBuilder(TecSvcConst.BASE_URI)
+// .appendOperationCallSegment("FICRTCollESTwoKeyNavParam").build(), ODataEntitySet.class,
+// Collections.<String, ODataValue> singletonMap("ParameterInt16",
+// getClient().getObjectFactory().newPrimitiveValueBuilder().buildInt32(2)));
+// assertNotNull(request);
+//
+// final ODataInvokeResponse<ODataEntitySet> response = request.execute();
+// assertEquals(HttpStatusCode.OK.getStatusCode(), response.getStatusCode());
+//
+// final ODataEntitySet entitySet = response.getBody();
+// assertNotNull(entitySet);
+// final List<ODataEntity> entities = entitySet.getEntities();
+// assertNotNull(entities);
+// assertEquals(2, entities.size());
+// final ODataEntity entity = entities.get(1);
+// assertNotNull(entity);
+// final ODataProperty property = entity.getProperty("PropertyString");
+// assertNotNull(property);
+// assertNotNull(property.getPrimitiveValue());
+// assertEquals("2", property.getPrimitiveValue().toValue());
+// }
+
+
@Test
public void countEntityCollection() throws Exception {
final ODataRawRequest request = getClient().getRetrieveRequestFactory()
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java
----------------------------------------------------------------------
diff --git a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java
index b8daec0..c78adda 100644
--- a/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java
+++ b/lib/client-api/src/main/java/org/apache/olingo/client/api/edm/xml/OnDeleteAction.java
@@ -23,6 +23,6 @@ public enum OnDeleteAction {
Cascade,
None,
SetNull,
- SetDefault;
+ SetDefault
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java
index 97c55e0..c7bba68 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/communication/request/retrieve/XMLMetadataRequestImpl.java
@@ -82,7 +82,7 @@ public class XMLMetadataRequestImpl
forInclusion.setAlias(schema.getAlias());
// process all edm:Annotations in each schema of the included document
- for (Annotations annotationGroup : ((SchemaImpl) schema).getAnnotationGroups()) {
+ for (Annotations annotationGroup : schema.getAnnotationGroups()) {
// take into account only when (TargetNamespace was either not provided or matches) and
// (Qualifier was either not provided or matches)
if ((StringUtils.isBlank(include.getTargetNamespace())
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java
index 4d3e83c..e5bd7bd 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/data/JSONServiceDocumentDeserializer.java
@@ -44,7 +44,7 @@ public class JSONServiceDocumentDeserializer extends JsonDeserializer {
protected ResWrap<ServiceDocument> doDeserialize(final JsonParser parser) throws IOException {
- final ObjectNode tree = (ObjectNode) parser.getCodec().readTree(parser);
+ final ObjectNode tree = parser.getCodec().readTree(parser);
ServiceDocumentImpl serviceDocument = new ServiceDocumentImpl();
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java
index ac98306..e5bc5c9 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/EdmStructuredTypeHelperImpl.java
@@ -77,23 +77,11 @@ public class EdmStructuredTypeHelperImpl implements EdmStructuredTypeHelper {
@Override
public boolean isOpenType() {
- boolean isOpen = false;
- if (structuralType instanceof ComplexType) {
- isOpen = ((ComplexType) structuralType).isOpenType();
- } else if (structuralType instanceof EntityType) {
- isOpen = ((EntityType) structuralType).isOpenType();
- }
- return isOpen;
+ return structuralType.isOpenType();
}
@Override
public boolean isAbstract() {
- boolean isAbstract = false;
- if (structuralType instanceof ComplexType) {
- isAbstract = ((ComplexType) structuralType).isAbstractType();
- } else if (structuralType instanceof EntityType) {
- isAbstract = ((EntityType) structuralType).isAbstractType();
- }
- return isAbstract;
+ return structuralType.isAbstractType();
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeImpl.java
index ea9783a..a95ff1a 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/edm/xml/EnumTypeImpl.java
@@ -85,7 +85,7 @@ public class EnumTypeImpl extends AbstractEdmItem implements EnumType, Annotatab
public Member getMember(final Integer value) {
Member result = null;
for (Member member : getMembers()) {
- if (value.equals(member.getValue())) {
+ if (String.valueOf(value).equals(member.getValue())) {
result = member;
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
index 17c4403..46acddb 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/serialization/ODataBinderImpl.java
@@ -327,12 +327,11 @@ public class ODataBinderImpl implements ODataBinder {
@Override
public Property getProperty(final ODataProperty property) {
- final ODataProperty _property = property;
final Property propertyResource = new PropertyImpl();
- propertyResource.setName(_property.getName());
- updateValuable(propertyResource, _property);
- annotations(_property, propertyResource);
+ propertyResource.setName(property.getName());
+ updateValuable(propertyResource, property);
+ annotations(property, propertyResource);
return propertyResource;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java
index 5e8273d..2815a61 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIBuilderImpl.java
@@ -285,9 +285,8 @@ public class URIBuilderImpl implements URIBuilder {
}
try {
- StringBuilder sb = segmentsBuilder;
if ((queryOptions.size() + parameters.size()) > 0) {
- sb.append("?");
+ segmentsBuilder.append("?");
List<NameValuePair> list1 = new LinkedList<NameValuePair>();
for (Map.Entry<String, String> option : queryOptions.entrySet()) {
list1.add(new BasicNameValuePair("$" + option.getKey(), option.getValue()));
@@ -301,10 +300,10 @@ public class URIBuilderImpl implements URIBuilder {
// which works in desktop java application, however, throws NoSuchMethodError in android OS,
// so here manually construct the URL by its overload URLEncodedUtils.format(List<>,String).
final String queryStr = encodeQueryParameter(list1);
- sb.append(queryStr);
+ segmentsBuilder.append(queryStr);
}
- return URI.create(sb.toString());
+ return URI.create(segmentsBuilder.toString());
} catch (IllegalArgumentException e) {
throw new IllegalArgumentException("Could not build valid URI", e);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
----------------------------------------------------------------------
diff --git a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
index 151b466..26399c2 100644
--- a/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
+++ b/lib/client-core/src/main/java/org/apache/olingo/client/core/uri/URIUtils.java
@@ -194,7 +194,7 @@ public final class URIUtils {
if (obj == null) {
value = Constants.ATTR_NULL;
} else if (obj instanceof Collection) {
- final StringBuffer buffer = new StringBuffer("[");
+ final StringBuilder buffer = new StringBuilder("[");
for (@SuppressWarnings("unchecked")
final Iterator<Object> itor = ((Collection<Object>) obj).iterator(); itor.hasNext();) {
buffer.append(escape(itor.next(), false));
@@ -206,7 +206,7 @@ public final class URIUtils {
value = buffer.toString();
} else if (obj instanceof Map) {
- final StringBuffer buffer = new StringBuffer("{");
+ final StringBuilder buffer = new StringBuilder("{");
for (@SuppressWarnings("unchecked")
final Iterator<Map.Entry<String, Object>> itor =
((Map<String, Object>) obj).entrySet().iterator(); itor.hasNext();) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
index 114f83d..77993c0 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/data/DeletedEntity.java
@@ -25,7 +25,7 @@ public interface DeletedEntity {
enum Reason {
deleted,
- changed;
+ changed
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataDeletedEntity.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataDeletedEntity.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataDeletedEntity.java
index 3b7a1bf..ba7401e 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataDeletedEntity.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/domain/ODataDeletedEntity.java
@@ -25,7 +25,7 @@ public interface ODataDeletedEntity {
enum Reason {
deleted,
- changed;
+ changed
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java
index 1077b01..b7efca7 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeKind.java
@@ -102,8 +102,7 @@ public enum EdmPrimitiveTypeKind {
throw new IllegalArgumentException(fqn + " does not look like an Edm primitive type");
}
- final EdmPrimitiveTypeKind kind = valueOf(fqn.substring(4));
- return kind;
+ return valueOf(fqn.substring(4));
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmContentKind.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmContentKind.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmContentKind.java
index 5e4a80d..f2eeb88 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmContentKind.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmContentKind.java
@@ -25,6 +25,6 @@ public enum EdmContentKind {
text,
html,
- xhtml;
+ xhtml
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java
index 890ccc5..135bbbc 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java
@@ -20,6 +20,6 @@ package org.apache.olingo.commons.api.edm.constants;
public enum EdmOnDelete {
- Cascade, None, SetNull, SetDefault;
+ Cascade, None, SetNull, SetDefault
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java
index c0f820c..bf24673 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java
@@ -23,6 +23,6 @@ package org.apache.olingo.commons.api.edm.constants;
*/
public enum EdmTypeKind {
- UNDEFINED, PRIMITIVE, ENUM, DEFINITION, COMPLEX, ENTITY, NAVIGATION, ACTION, FUNCTION, SYSTEM;
+ UNDEFINED, PRIMITIVE, ENUM, DEFINITION, COMPLEX, ENTITY, NAVIGATION, ACTION, FUNCTION, SYSTEM
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java
index c8efb77..97cd674 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/edm/geo/Geospatial.java
@@ -36,7 +36,7 @@ public abstract class Geospatial implements Serializable {
public enum Dimension {
GEOMETRY,
- GEOGRAPHY;
+ GEOGRAPHY
}
@@ -69,7 +69,7 @@ public abstract class Geospatial implements Serializable {
/**
* The OGIS geometry type number for feature collections.
*/
- GEOSPATIALCOLLECTION;
+ GEOSPATIALCOLLECTION
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java
----------------------------------------------------------------------
diff --git a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java
index 38027ed..149c6c1 100644
--- a/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java
+++ b/lib/commons-api/src/main/java/org/apache/olingo/commons/api/http/HttpMethod.java
@@ -28,6 +28,6 @@ public enum HttpMethod {
PUT,
PATCH,
MERGE,
- DELETE;
+ DELETE
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java
index b9e3904..f4dbba1 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java
@@ -68,11 +68,10 @@ public final class EdmDecimal extends SingletonPrimitiveType {
}
private static boolean validateLiteral(final String value) {
- boolean valid = PATTERN.matcher(value).matches();
- return valid;
+ return PATTERN.matcher(value).matches();
}
- private static final boolean validatePrecisionAndScale(final String value, final Integer precision,
+ private static boolean validatePrecisionAndScale(final String value, final Integer precision,
final Integer scale) {
final Matcher matcher = PATTERN.matcher(value);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java
index be9b5a9..2cbdbfd 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java
@@ -133,7 +133,7 @@ public final class EdmDouble extends SingletonPrimitiveType {
} else if (value instanceof BigDecimal) {
final double doubleValue = ((BigDecimal) value).doubleValue();
if (!Double.isInfinite(doubleValue) && BigDecimal.valueOf(doubleValue).compareTo((BigDecimal) value) == 0) {
- return ((BigDecimal) value).toString();
+ return value.toString();
} else {
throw new EdmPrimitiveTypeException("The value '" + value + "' is not valid.");
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java
index 398768c..c4b2116 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java
@@ -123,7 +123,7 @@ public final class EdmSingle extends SingletonPrimitiveType {
return (Double) value == Double.NEGATIVE_INFINITY ? EdmDouble.NEGATIVE_INFINITY : EdmDouble.POSITIVE_INFINITY;
} else {
final String floatString = Float.toString(((Double) value).floatValue());
- if (floatString.equals(((Double) value).toString())) {
+ if (floatString.equals(value.toString())) {
return floatString;
} else {
throw new EdmPrimitiveTypeException("The value '" + value + "' is not valid.");
@@ -135,7 +135,7 @@ public final class EdmSingle extends SingletonPrimitiveType {
} else if (value instanceof BigDecimal) {
final float floatValue = ((BigDecimal) value).floatValue();
if (!Float.isInfinite(floatValue) && BigDecimal.valueOf(floatValue).compareTo((BigDecimal) value) == 0) {
- return ((BigDecimal) value).toString();
+ return value.toString();
} else {
throw new EdmPrimitiveTypeException("The value '" + value + "' is not valid.");
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
index 0d21233..dcfb328 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/AtomDeserializer.java
@@ -673,7 +673,7 @@ public class AtomDeserializer extends AbstractAtomDealer implements ODataDeseria
entity.getOperations().add(operation);
} else if (Constants.QNAME_ATOM_ELEM_CONTENT.equals(event.asStartElement().getName())) {
final Attribute type = event.asStartElement().getAttributeByName(QName.valueOf(Constants.ATTR_TYPE));
- if (type == null || ContentType.APPLICATION_XML.equals(type.getValue())) {
+ if (type == null || ContentType.APPLICATION_XML.toContentTypeString().equals(type.getValue())) {
properties(reader, skipBeforeFirstStartElement(reader), entity);
} else {
entity.setMediaContentType(type.getValue());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
index 4f0b288..5596fb3 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntityDeserializer.java
@@ -170,7 +170,7 @@ public class JsonEntityDeserializer extends JsonDeserializer {
final String linkTitle = getTitle(field);
for (Link link : entity.getMediaEditLinks()) {
if (linkTitle.equals(link.getTitle())) {
- ((LinkImpl) link).setType(field.getValue().asText());
+ link.setType(field.getValue().asText());
}
}
toRemove.add(field.getKey());
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
index a7407bd..2a8e3e7 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonEntitySetSerializer.java
@@ -39,7 +39,7 @@ public class JsonEntitySetSerializer extends JsonSerializer {
protected void doSerialize(final EntitySet entitySet, final JsonGenerator jgen)
throws IOException, EdmPrimitiveTypeException {
- doContainerSerialize(new ResWrap<EntitySet>((URI) null, null, entitySet), jgen);
+ doContainerSerialize(new ResWrap<EntitySet>(null, null, entitySet), jgen);
}
protected void doContainerSerialize(final ResWrap<EntitySet> container, final JsonGenerator jgen)
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java
----------------------------------------------------------------------
diff --git a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java
index b5bda8c..ade76ed 100644
--- a/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java
+++ b/lib/commons-core/src/main/java/org/apache/olingo/commons/core/serialization/JsonPropertyDeserializer.java
@@ -49,7 +49,7 @@ public class JsonPropertyDeserializer extends JsonDeserializer {
protected ResWrap<Property> doDeserialize(final JsonParser parser) throws IOException {
- final ObjectNode tree = (ObjectNode) parser.getCodec().readTree(parser);
+ final ObjectNode tree = parser.getCodec().readTree(parser);
final String metadataETag;
final URI contextURL;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
index 7805fb0..fcbd150 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/serializer/EntitySerializerOptions.java
@@ -46,7 +46,7 @@ public class EntitySerializerOptions {
private EntitySerializerOptions() {}
/** Initializes the options builder. */
- public static final Builder with() {
+ public static Builder with() {
return new Builder();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
----------------------------------------------------------------------
diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
index bb13374..61dda8a 100644
--- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
+++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoKind.java
@@ -63,5 +63,5 @@ public enum UriInfoKind {
* Class: {@link UriInfoService}<br>
* URI: http://.../serviceroot
*/
- service;
+ service
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java
index 1a4cbc9..e162504 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/ODataExceptionHelper.java
@@ -119,8 +119,7 @@ public class ODataExceptionHelper {
}
private static ODataServerError basicServerError(Exception e) {
- ODataServerError serverError = new ODataServerError().setException(e).setMessage(e.getMessage());
- return serverError;
+ return new ODataServerError().setException(e).setMessage(e.getMessage());
}
private static ODataServerError basicTranslatedError(ODataTranslatedException e, Locale requestedLocale) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
index 493358a..c5aca72 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/deserializer/FixedFormatDeserializerImpl.java
@@ -36,7 +36,7 @@ public class FixedFormatDeserializerImpl implements FixedFormatDeserializer {
public byte[] binary(InputStream content) throws DeserializerException {
ByteArrayOutputStream result = new ByteArrayOutputStream();
byte[] buffer = new byte[128];
- int count = -1;
+ int count;
try {
while ((count = content.read(buffer)) > -1) {
result.write(buffer, 0, count);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
index 0fbddbe..89305d2 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmComplexTypeImpl.java
@@ -38,8 +38,7 @@ public class EdmComplexTypeImpl extends AbstractEdmComplexType {
public static EdmComplexTypeImpl getInstance(
final Edm edm, final FullQualifiedName name, final ComplexType complexType) {
- final EdmComplexTypeImpl instance = new EdmComplexTypeImpl(edm, name, complexType);
- return instance;
+ return new EdmComplexTypeImpl(edm, name, complexType);
}
private EdmComplexTypeImpl(final Edm edm, final FullQualifiedName name, final ComplexType complexType) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
index 4a255dd..755f358 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/edm/provider/EdmEntityTypeImpl.java
@@ -46,8 +46,7 @@ public class EdmEntityTypeImpl extends AbstractEdmEntityType {
public static EdmEntityTypeImpl getInstance(final Edm edm, final FullQualifiedName name,
final EntityType entityType) {
- final EdmEntityTypeImpl instance = new EdmEntityTypeImpl(edm, name, entityType);
- return instance;
+ return new EdmEntityTypeImpl(edm, name, entityType);
}
private EdmEntityTypeImpl(final Edm edm, final FullQualifiedName name, final EntityType entityType) {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
index a8d7898..4f6447b 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/serializer/BatchResponseSerializer.java
@@ -121,7 +121,7 @@ public class BatchResponseSerializer {
}
private void appendChangeSetHeader(StringBuilder builder, final String changeSetBoundary) {
- appendHeader(HttpHeader.CONTENT_TYPE, HttpContentType.MULTIPART_MIXED.toString() + "; boundary="
+ appendHeader(HttpHeader.CONTENT_TYPE, HttpContentType.MULTIPART_MIXED + "; boundary="
+ changeSetBoundary, builder);
}
@@ -136,7 +136,7 @@ public class BatchResponseSerializer {
private void appendStatusLine(ODataResponse response, StringBuilder builder) {
builder.append("HTTP/1.1")
.append(SP)
- .append("" + response.getStatusCode())
+ .append(response.getStatusCode())
.append(SP)
.append(HttpStatusCode.fromStatusCode(response.getStatusCode()).toString())
.append(CRLF);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java
index caa8b6c..08f0347 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAllImpl.java
@@ -59,8 +59,6 @@ public class UriResourceLambdaAllImpl extends UriResourceTypedImpl implements Ur
return this;
}
- ;
-
@Override
public Expression getExpression() {
return expression;
@@ -71,8 +69,6 @@ public class UriResourceLambdaAllImpl extends UriResourceTypedImpl implements Ur
return this;
}
- ;
-
@Override
public String toString() {
return "all";
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java
index 75e44a8..e66a37c 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceLambdaAnyImpl.java
@@ -59,8 +59,6 @@ public class UriResourceLambdaAnyImpl extends UriResourceTypedImpl implements Ur
return this;
}
- ;
-
@Override
public Expression getExpression() {
return expression;
@@ -74,5 +72,5 @@ public class UriResourceLambdaAnyImpl extends UriResourceTypedImpl implements Ur
@Override
public String toString() {
return "any";
- };
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
index a22933f..2af79e6 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/Parser.java
@@ -69,7 +69,7 @@ public class Parser {
private enum ParserEntryRules {
All, Batch, CrossJoin, Entity, ExpandItems, FilterExpression, Metadata, PathSegment, Orderby, Select
- };
+ }
public Parser setLogLevel(final int logLevel) {
this.logLevel = logLevel;
@@ -162,10 +162,7 @@ public class Parser {
FilterExpressionEOFContext ctxFilterExpression =
(FilterExpressionEOFContext) parseRule(option.value, ParserEntryRules.FilterExpression);
- FilterOptionImpl filterOption =
- (FilterOptionImpl) uriParseTreeVisitor.visitFilterExpressionEOF(ctxFilterExpression);
-
- systemOption = filterOption;
+ systemOption = (FilterOptionImpl) uriParseTreeVisitor.visitFilterExpressionEOF(ctxFilterExpression);
} else if (option.name.equals(SystemQueryOptionKind.FORMAT.toString())) {
FormatOptionImpl formatOption = new FormatOptionImpl();
@@ -186,10 +183,7 @@ public class Parser {
ExpandItemsEOFContext ctxExpandItems =
(ExpandItemsEOFContext) parseRule(option.value, ParserEntryRules.ExpandItems);
- ExpandOptionImpl expandOption =
- (ExpandOptionImpl) uriParseTreeVisitor.visitExpandItemsEOF(ctxExpandItems);
-
- systemOption = expandOption;
+ systemOption = (ExpandOptionImpl) uriParseTreeVisitor.visitExpandItemsEOF(ctxExpandItems);
} else if (option.name.equals(SystemQueryOptionKind.ID.toString())) {
IdOptionImpl idOption = new IdOptionImpl();
@@ -204,20 +198,14 @@ public class Parser {
OrderByEOFContext ctxOrderByExpression =
(OrderByEOFContext) parseRule(option.value, ParserEntryRules.Orderby);
- OrderByOptionImpl orderByOption =
- (OrderByOptionImpl) uriParseTreeVisitor.visitOrderByEOF(ctxOrderByExpression);
-
- systemOption = orderByOption;
+ systemOption = (OrderByOptionImpl) uriParseTreeVisitor.visitOrderByEOF(ctxOrderByExpression);
} else if (option.name.equals(SystemQueryOptionKind.SEARCH.toString())) {
throw new RuntimeException("System query option '$search' not implemented!");
} else if (option.name.equals(SystemQueryOptionKind.SELECT.toString())) {
SelectEOFContext ctxSelectEOF =
(SelectEOFContext) parseRule(option.value, ParserEntryRules.Select);
- SelectOptionImpl selectOption =
- (SelectOptionImpl) uriParseTreeVisitor.visitSelectEOF(ctxSelectEOF);
-
- systemOption = selectOption;
+ systemOption = (SelectOptionImpl) uriParseTreeVisitor.visitSelectEOF(ctxSelectEOF);
} else if (option.name.equals(SystemQueryOptionKind.SKIP.toString())) {
SkipOptionImpl skipOption = new SkipOptionImpl();
skipOption.setName(option.name);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java
index 8585edb..be7cdbc 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriDecoder.java
@@ -87,7 +87,6 @@ public class UriDecoder {
// Empty path segments of the resource path are removed.
while (list.remove("")) {
// this place intentionally left blank
- ;
}
return skipSegments > 0 ? list.subList(skipSegments, list.size()) : list;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
----------------------------------------------------------------------
diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
index 52a53f7..5373fda 100644
--- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
+++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/parser/UriParseTreeVisitor.java
@@ -666,8 +666,7 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> {
@Override
public Object visitAllEOF(final AllEOFContext ctx) {
- UriInfoImpl crossJoin = new UriInfoImpl().setKind(UriInfoKind.all);
- context.contextUriInfo = crossJoin;
+ context.contextUriInfo = new UriInfoImpl().setKind(UriInfoKind.all);
return null;
}
@@ -861,9 +860,8 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> {
@Override
public Object visitMetadataEOF(final MetadataEOFContext ctx) {
- UriInfoImpl uriInfo = new UriInfoImpl().setKind(UriInfoKind.metadata);
- context.contextUriInfo = uriInfo;
+ context.contextUriInfo = new UriInfoImpl().setKind(UriInfoKind.metadata);
return null;
}
@@ -1259,15 +1257,13 @@ public class UriParseTreeVisitor extends UriParserBaseVisitor<Object> {
@Override
public Object visitFilter(final FilterContext ctx) {
- FilterOptionImpl filter = new FilterOptionImpl().setExpression((ExpressionImpl) ctx.children.get(2).accept(this));
- return filter;
+ return new FilterOptionImpl().setExpression((ExpressionImpl) ctx.children.get(2).accept(this));
}
@Override
public Object visitFilterExpressionEOF(final FilterExpressionEOFContext ctx) {
- FilterOptionImpl filter = new FilterOptionImpl().setExpression((ExpressionImpl) ctx.children.get(0).accept(this));
- return filter;
+ return new FilterOptionImpl().setExpression((ExpressionImpl) ctx.children.get(0).accept(this));
}
@Override
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java
index 128d3c8..d45e8a9 100644
--- a/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java
+++ b/lib/server-tecsvc/src/main/java/org/apache/olingo/server/tecsvc/processor/queryoptions/expression/operand/TypedOperand.java
@@ -127,7 +127,7 @@ public class TypedOperand extends VisitorOperand {
return asTypedOperand(EdmInt64.getInstance());
} else if (type.equals(EdmInt32.getInstance()) || oType.equals(EdmInt32.getInstance())) {
return asTypedOperand(EdmInt32.getInstance());
- } else if (type.equals(EdmInt16.getInstance()) || oType.equals(equals(EdmInt16.getInstance()))) {
+ } else if (type.equals(EdmInt16.getInstance()) || oType.equals(EdmInt16.getInstance())) {
return asTypedOperand(EdmInt16.getInstance());
} else {
return asTypedOperand((EdmPrimitiveType) type);
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
index d79dfd3..539828d 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ExpandValidator.java
@@ -112,10 +112,9 @@ public class ExpandValidator implements TestValidator {
}
public ExpandValidator goExpand() {
- ExpandValidator val = new ExpandValidator()
+ return new ExpandValidator()
.setExpand((ExpandOptionImpl) expandItem.getExpandOption())
.setUpValidator(this);
- return val;
}
public ExpandValidator first() {
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
index 9664b7e..4eb12ec 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/FilterTreeToText.java
@@ -62,7 +62,7 @@ public class FilterTreeToText implements ExpressionVisitor<String> {
public String visitUnaryOperator(final UnaryOperatorKind operator, final String operand)
throws ExpressionVisitException {
- return "<" + operator + " " + operand.toString() + ">";
+ return "<" + operator + " " + operand + ">";
}
@Override
@@ -90,9 +90,7 @@ public class FilterTreeToText implements ExpressionVisitor<String> {
public String visitMember(final UriInfoResource resource) throws ExpressionVisitException, ODataApplicationException {
String ret = "";
- UriInfoResource path = resource;
-
- for (UriResource item : path.getUriResourceParts()) {
+ for (UriResource item : resource.getUriResourceParts()) {
String tmp = "";
if (item instanceof UriResourceLambdaAll) {
UriResourceLambdaAll all = (UriResourceLambdaAll) item;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/fadb6c86/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java
----------------------------------------------------------------------
diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java
index 1859ea2..6f4d84e 100644
--- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java
+++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ParseTreeToText.java
@@ -67,8 +67,7 @@ public class ParseTreeToText {
} else if (t instanceof TerminalNode) {
Token symbol = ((TerminalNode) t).getSymbol();
if (symbol != null) {
- String s = symbol.getText();
- return s;
+ return symbol.getText();
}
}
}