You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ra...@apache.org on 2017/10/12 06:26:01 UTC
[2/2] olingo-odata2 git commit: [OLINGO-1176] Code Improvements
[OLINGO-1176] Code Improvements
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata2/commit/aedda745
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata2/tree/aedda745
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata2/diff/aedda745
Branch: refs/heads/master
Commit: aedda745594fc883e085d42950b1647d867ef6c8
Parents: daa83f4
Author: ramya vasanth <ra...@sap.com>
Authored: Thu Oct 12 11:55:49 2017 +0530
Committer: ramya vasanth <ra...@sap.com>
Committed: Thu Oct 12 11:55:49 2017 +0530
----------------------------------------------------------------------
.../processor/core/ListsProcessor.java | 17 ++++-----
.../core/edm/AnnotationEdmProvider.java | 35 ------------------
.../jpa/processor/core/ODataEntityParser.java | 4 +--
.../processor/core/ODataExpressionParser.java | 4 +--
.../core/ODataJPAResponseBuilderDefault.java | 12 +++----
.../core/access/data/JPAEntityParser.java | 3 +-
.../core/access/data/JPAFunctionContext.java | 4 +--
.../jpa/processor/core/access/data/JPALink.java | 7 ++--
.../jpa/processor/core/access/data/JPAPage.java | 2 +-
.../core/access/data/JPAQueryBuilder.java | 2 +-
.../core/callback/JPAExpandCallBack.java | 2 +-
.../core/factory/ODataJPAFactoryImpl.java | 2 ++
.../JPQLJoinSelectSingleStatementBuilder.java | 2 +-
.../core/jpql/JPQLJoinStatementBuilder.java | 2 +-
.../jpql/JPQLSelectSingleStatementBuilder.java | 2 +-
.../processor/core/model/JPAEdmAssociation.java | 13 +++----
.../core/model/JPAEdmFunctionImport.java | 8 ++---
.../processor/core/model/JPAEdmProperty.java | 4 +--
.../olingo/odata2/api/ODataServiceVersion.java | 5 ++-
.../odata2/api/commons/ODataHttpHeaders.java | 3 ++
.../odata2/api/edm/EdmSimpleTypeKind.java | 4 +++
.../olingo/odata2/api/edm/EdmTargetPath.java | 4 +++
.../api/edm/provider/EdmProviderFactory.java | 3 ++
.../odata2/api/exception/MessageReference.java | 2 +-
.../api/processor/ODataSingleProcessor.java | 2 +-
.../odata2/core/ODataPathSegmentImpl.java | 7 ++--
.../olingo/odata2/core/ODataRequestHandler.java | 1 -
.../olingo/odata2/core/ODataRequestImpl.java | 10 +++---
.../olingo/odata2/core/ODataResponseImpl.java | 3 --
.../core/batch/BatchChangeSetPartImpl.java | 6 ++--
.../odata2/core/batch/v2/BatchBodyPart.java | 8 ++---
.../odata2/core/batch/v2/BatchLineReader.java | 16 ++++-----
.../odata2/core/batch/v2/BatchParserCommon.java | 18 ++++++----
.../core/batch/v2/BatchQueryOperation.java | 4 +--
.../batch/v2/BatchRequestTransformator.java | 4 +--
.../batch/v2/BatchResponseTransformator.java | 7 ++--
.../core/batch/v2/BatchTransformatorCommon.java | 14 ++++----
.../olingo/odata2/core/batch/v2/Header.java | 15 ++++----
.../olingo/odata2/core/commons/ContentType.java | 11 +++---
.../odata2/core/debug/DebugInfoRequest.java | 13 +++----
.../core/debug/ODataDebugResponseWrapper.java | 13 +++----
.../odata2/core/edm/EdmDateTimeOffset.java | 2 +-
.../olingo/odata2/core/edm/EdmDecimal.java | 2 +-
.../olingo/odata2/core/edm/EdmDouble.java | 8 ++---
.../core/edm/EdmSimpleTypeFacadeImpl.java | 2 +-
.../olingo/odata2/core/edm/EdmSingle.java | 8 ++---
.../provider/EdmEntityContainerImplProv.java | 16 ++++-----
.../edm/provider/EdmFunctionImportImplProv.java | 12 +++----
.../core/ep/aggregator/EntityTypeMapping.java | 12 +++----
.../core/ep/consumer/JsonEntryConsumer.java | 2 +-
.../core/ep/consumer/XmlFeedConsumer.java | 2 +-
.../core/ep/consumer/XmlMetadataConsumer.java | 6 ++--
.../JsonDeletedEntryEntityProducer.java | 2 +-
.../odata2/core/rest/ODataExceptionWrapper.java | 38 ++++++++++----------
.../core/servlet/ODataExceptionWrapper.java | 16 ++++-----
.../odata2/core/servlet/ODataServlet.java | 1 -
.../olingo/odata2/core/servlet/RestUtil.java | 2 +-
.../olingo/odata2/core/uri/UriParserImpl.java | 13 +++----
.../core/uri/expression/FilterParserImpl.java | 22 ++----------
.../core/uri/expression/InfoUnaryOperator.java | 24 -------------
.../core/uri/expression/OrderByParserImpl.java | 4 +--
.../uri/expression/ParameterSetCombination.java | 3 +-
.../odata2/core/uri/expression/TokenList.java | 2 +-
.../odata2/core/uri/expression/Tokenizer.java | 3 +-
.../core/uri/expression/TokenizerException.java | 13 -------
65 files changed, 220 insertions(+), 293 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
index a896c80..6ae6abd 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessor.java
@@ -28,6 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.olingo.odata2.annotation.processor.core.datasource.DataSource;
import org.apache.olingo.odata2.annotation.processor.core.datasource.DataSource.BinaryData;
@@ -431,7 +432,6 @@ public class ListsProcessor extends DataSourceProcessor {
mapFunctionParameters(uriInfo.getFunctionImportParameters()),
uriInfo.getNavigationSegments());
- // if (!appliesFilter(data, uriInfo.getFilter()))
if (data == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
}
@@ -482,7 +482,6 @@ public class ListsProcessor extends DataSourceProcessor {
final Object targetData = dataSource.readRelatedData(entitySet, sourceData, targetEntitySet, keys);
- // if (!appliesFilter(targetData, uriInfo.getFilter()))
if (targetData == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
}
@@ -559,7 +558,6 @@ public class ListsProcessor extends DataSourceProcessor {
mapFunctionParameters(uriInfo.getFunctionImportParameters()),
uriInfo.getNavigationSegments());
- // if (!appliesFilter(data, uriInfo.getFilter()))
if (data == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
}
@@ -597,7 +595,6 @@ public class ListsProcessor extends DataSourceProcessor {
mapFunctionParameters(uriInfo.getFunctionImportParameters()),
uriInfo.getNavigationSegments());
- // if (!appliesFilter(data, uriInfo.getFilter()))
if (data == null) {
throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
}
@@ -882,10 +879,10 @@ public class ListsProcessor extends DataSourceProcessor {
return Collections.emptyMap();
} else {
Map<String, Object> parameterMap = new HashMap<String, Object>();
- for (final String parameterName : functionImportParameters.keySet()) {
- final EdmLiteral literal = functionImportParameters.get(parameterName);
+ for (final Entry<String, EdmLiteral> parameter : functionImportParameters.entrySet()) {
+ final EdmLiteral literal = parameter.getValue();
final EdmSimpleType type = literal.getType();
- parameterMap.put(parameterName, type.valueOfString(literal.getLiteral(), EdmLiteralKind.DEFAULT, null, type
+ parameterMap.put(parameter.getKey(), type.valueOfString(literal.getLiteral(), EdmLiteralKind.DEFAULT, null, type
.getDefaultType()));
}
return parameterMap;
@@ -1278,7 +1275,7 @@ public class ListsProcessor extends DataSourceProcessor {
final int timingHandle = context.startRuntimeMeasurement(getClass().getSimpleName(), "appliesFilter");
try {
- return data != null && (filter == null || evaluateExpression(data, filter.getExpression()).equals("true"));
+ return data != null && (filter == null || "true".equals(evaluateExpression(data, filter.getExpression())));
} catch (final RuntimeException e) {
return false;
} finally {
@@ -1344,9 +1341,9 @@ public class ListsProcessor extends DataSourceProcessor {
return Long.toString(Long.valueOf(left) % Long.valueOf(right));
}
case AND:
- return Boolean.toString(left.equals("true") && right.equals("true"));
+ return Boolean.toString("true".equals(left) && "true".equals(right));
case OR:
- return Boolean.toString(left.equals("true") || right.equals("true"));
+ return Boolean.toString("true".equals(left) || "true".equals(right));
case EQ:
return Boolean.toString(left.equals(right));
case NE:
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
index 9dd6bd8..3ccf6e4 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/edm/AnnotationEdmProvider.java
@@ -532,38 +532,6 @@ public class AnnotationEdmProvider extends EdmProvider {
return navProp;
}
- // private EdmSimpleTypeKind getEdmSimpleType(Class<?> type) {
- // if (type == String.class) {
- // return EdmType.String;
- // } else if (type == boolean.class || type == Boolean.class) {
- // return EdmType.Boolean;
- // } else if (type == byte.class || type == Byte.class) {
- // return EdmType.SByte;
- // } else if (type == short.class || type == Short.class) {
- // return EdmType.Int16;
- // } else if (type == int.class || type == Integer.class) {
- // return EdmType.Int32;
- // } else if (type == long.class || type == Long.class) {
- // return EdmType.Int64;
- // } else if (type == double.class || type == Double.class) {
- // return EdmType.Double;
- // } else if (type == float.class || type == Float.class) {
- // return EdmType.Single;
- // } else if (type == BigInteger.class || type == BigDecimal.class) {
- // return EdmType.Decimal;
- // } else if (type == Byte[].class || type == byte[].class) {
- // return EdmType.Binary;
- // } else if (type == Date.class) {
- // return EdmType.DateTime;
- // } else if (type == Calendar.class) {
- // return EdmType.DateTimeOffset;
- // } else if (type == UUID.class) {
- // return EdmType.Guid;
- // } else {
- // throw new UnsupportedOperationException("Not yet supported type '" + type + "'.");
- // }
- // }
-
private EdmType getEdmType(final Class<?> type) {
if (type == String.class) {
return EdmType.STRING;
@@ -650,7 +618,6 @@ public class AnnotationEdmProvider extends EdmProvider {
static class SchemaBuilder {
final private String namespace;
- // private String alias;
private final List<Using> usings = new ArrayList<Using>();
private final List<EntityType> entityTypes = new ArrayList<EntityType>();
private final List<ComplexType> complexTypes = new ArrayList<ComplexType>();
@@ -737,8 +704,6 @@ public class AnnotationEdmProvider extends EdmProvider {
private final List<AssociationSet> associationSets = new ArrayList<AssociationSet>();
private final List<FunctionImport> functionImports = new ArrayList<FunctionImport>();
- // private Documentation documentation;
-
private ContainerBuilder(final String namespace, final String containerName) {
this.namespace = namespace;
name = containerName;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataEntityParser.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataEntityParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataEntityParser.java
index f7e46dc..b42a0b5 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataEntityParser.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataEntityParser.java
@@ -111,9 +111,9 @@ public final class ODataEntityParser {
try {
uriString = EntityProvider.readLink(contentType, entitySet, content);
ODataContext odataContext = context.getODataContext();
- final String serviceRoot = odataContext.getPathInfo().getServiceRoot().toString();
+ final String svcRoot = odataContext.getPathInfo().getServiceRoot().toString();
final String path =
- uriString.startsWith(serviceRoot.toString()) ? uriString.substring(serviceRoot.length()) : uriString;
+ uriString.startsWith(svcRoot.toString()) ? uriString.substring(svcRoot.length()) : uriString;
final List<PathSegment> pathSegment = getPathSegment(path);
edm = getEdm();
uri = UriParser.parse(edm, pathSegment, Collections.<String, String> emptyMap());
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
index 9879e66..4187ab0 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataExpressionParser.java
@@ -232,11 +232,9 @@ public class ODataExpressionParser {
case TOLOWER:
return String.format("LOWER(%s)", first);
case STARTSWITH:
- // second = second.substring(1, second.length() - 1);
second = updateValueIfWildcards(second);
return String.format("%s LIKE CONCAT(%s,'%%') ESCAPE '\\'", first, second);
case ENDSWITH:
- // second = second.substring(1, second.length() - 1);
second = updateValueIfWildcards(second);
return String.format("%s LIKE CONCAT('%%',%s) ESCAPE '\\'", first, second);
default:
@@ -269,7 +267,7 @@ public class ODataExpressionParser {
*/
public static String parseToJPASelectExpression(final String tableAlias, final ArrayList<String> selectedFields) {
- if ((selectedFields == null) || (selectedFields.size() == 0)) {
+ if ((selectedFields == null) || (selectedFields.isEmpty())) {
return tableAlias;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
index 6d42ec5..b8ac74f 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/ODataJPAResponseBuilderDefault.java
@@ -93,14 +93,14 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
List<Map<String, Object>> edmEntityList = null;
JPAEntityParser jpaResultParser = new JPAEntityParser();
final List<SelectItem> selectedItems = resultsView.getSelect();
- if (selectedItems != null && selectedItems.size() > 0) {
+ if (selectedItems != null && !selectedItems.isEmpty()) {
edmEntityList =
jpaResultParser.parse2EdmEntityList(jpaEntities, buildSelectItemList(selectedItems, edmEntityType));
} else {
edmEntityList = jpaResultParser.parse2EdmEntityList(jpaEntities, edmEntityType);
}
expandList = resultsView.getExpand();
- if (expandList != null && expandList.size() != 0) {
+ if (expandList != null && !expandList.isEmpty()) {
int count = 0;
List<EdmNavigationProperty> edmNavPropertyList = constructListofNavProperty(expandList);
for (Object jpaEntity : jpaEntities) {
@@ -148,7 +148,7 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
JPAEntityParser jpaResultParser = new JPAEntityParser();
final List<SelectItem> selectedItems = resultsView.getSelect();
- if (selectedItems != null && selectedItems.size() > 0) {
+ if (selectedItems != null && !selectedItems.isEmpty()) {
edmPropertyValueMap =
jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, resultsView
.getTargetEntitySet().getEntityType()));
@@ -157,7 +157,7 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
}
expandList = resultsView.getExpand();
- if (expandList != null && expandList.size() != 0) {
+ if (expandList != null && !expandList.isEmpty()) {
HashMap<String, Object> navigationMap =
jpaResultParser.parse2EdmNavigationValueMap(jpaEntity, constructListofNavProperty(expandList));
edmPropertyValueMap.putAll(navigationMap);
@@ -216,7 +216,7 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
EntityProviderWriteProperties feedProperties = null;
try {
- feedProperties = getEntityProviderPropertiesforPost(oDataJPAContext, uriInfo);
+ feedProperties = getEntityProviderPropertiesforPost(oDataJPAContext);
} catch (ODataException e) {
throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
}
@@ -592,7 +592,7 @@ public final class ODataJPAResponseBuilderDefault implements ODataJPAResponseBui
}
private static EntityProviderWriteProperties getEntityProviderPropertiesforPost(
- final ODataJPAContext odataJPAContext, final PostUriInfo resultsView) throws ODataJPARuntimeException {
+ final ODataJPAContext odataJPAContext) throws ODataJPARuntimeException {
ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
try {
entityFeedPropertiesBuilder =
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
index ef9aa36..17279ce 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntityParser.java
@@ -176,7 +176,7 @@ public final class JPAEntityParser {
return navigationMap;
}
if (navigationPropertyList != null
- && navigationPropertyList.size() != 0) {
+ && !navigationPropertyList.isEmpty()) {
try {
for (EdmNavigationProperty navigationProperty : navigationPropertyList) {
@@ -537,6 +537,7 @@ public final class JPAEntityParser {
case ONE:
case ZERO_TO_ONE:
params = new Class<?>[] { ((JPAEdmMapping) end.getEntityType().getMapping()).getJPAType() };
+ break;
default:
break;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAFunctionContext.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAFunctionContext.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAFunctionContext.java
index 2dfb933..565153c 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAFunctionContext.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAFunctionContext.java
@@ -113,8 +113,8 @@ public class JPAFunctionContext extends JPAMethodContext {
for (String paramName : functionImport.getParameterNames()) {
EdmLiteral literal = edmArguments.get(paramName);
EdmParameter parameter = functionImport.getParameter(paramName);
- JPAEdmMapping mapping = (JPAEdmMapping) parameter.getMapping();
- args[i++] = convertArgument(literal, parameter.getFacets(), mapping.getJPAType());
+ JPAEdmMapping mappingValue = (JPAEdmMapping) parameter.getMapping();
+ args[i++] = convertArgument(literal, parameter.getFacets(), mappingValue.getJPAType());
}
return args;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
index 06db261..3ee599b 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPALink.java
@@ -88,12 +88,12 @@ public class JPALink {
public void create(final PostUriInfo uriInfo, final InputStream content, final String requestContentType,
final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
- modifyLink((UriInfo) uriInfo, content, requestContentType, contentType);
+ modifyLink((UriInfo) uriInfo, content, requestContentType);
}
public void update(final PutMergePatchUriInfo putUriInfo, final InputStream content, final String requestContentType,
final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
- modifyLink((UriInfo) putUriInfo, content, requestContentType, contentType);
+ modifyLink((UriInfo) putUriInfo, content, requestContentType);
}
public void delete(final DeleteUriInfo uriInfo) throws ODataJPARuntimeException {
@@ -285,8 +285,7 @@ public class JPALink {
return links;
}
- private void modifyLink(final UriInfo uriInfo, final InputStream content, final String requestContentType,
- final String contentType)
+ private void modifyLink(final UriInfo uriInfo, final InputStream content, final String requestContentType)
throws ODataJPARuntimeException, ODataJPAModelException {
try {
EdmEntitySet targetEntitySet = uriInfo.getTargetEntitySet();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java
index 07d7dd9..d3dc88b 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAPage.java
@@ -162,7 +162,7 @@ public class JPAPage implements JPAPaging {
}
private void formulateNextPage() {
- if (pagedEntities.size() == 0) {
+ if (pagedEntities.isEmpty()) {
nextPage = 0;
} else if (pagedEntities.size() < pageSize) {
nextPage = 0;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java
index 969772c..232e90c 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAQueryBuilder.java
@@ -216,7 +216,7 @@ public class JPAQueryBuilder {
public JPQLContextType determineJPQLContextType(UriInfo uriParserResultView, UriInfoType type) {
JPQLContextType contextType = null;
- if (uriParserResultView.getNavigationSegments().size() > 0) {
+ if (!uriParserResultView.getNavigationSegments().isEmpty()) {
if (type == UriInfoType.GetEntitySet) {
contextType = JPQLContextType.JOIN;
} else if (type == UriInfoType.Delete || type == UriInfoType.GetEntity
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/callback/JPAExpandCallBack.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/callback/JPAExpandCallBack.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/callback/JPAExpandCallBack.java
index 8d4102c..ae617df 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/callback/JPAExpandCallBack.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/callback/JPAExpandCallBack.java
@@ -149,7 +149,7 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
if (nextEntitySet == null) {
nextEntitySet = context.getSourceEntitySet().getRelatedEntitySet(currentNavigationProperty);
}
- if (currentExpandTreeNode.getProperties().size() > 0) {
+ if (!currentExpandTreeNode.getProperties().isEmpty()) {
edmEntityList =
jpaResultParser.parse2EdmEntityList(listOfItems, getEdmProperties(nextEntitySet,
currentExpandTreeNode));
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/factory/ODataJPAFactoryImpl.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/factory/ODataJPAFactoryImpl.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/factory/ODataJPAFactoryImpl.java
index 6ef809f..fbd5880 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/factory/ODataJPAFactoryImpl.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/factory/ODataJPAFactoryImpl.java
@@ -97,6 +97,7 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
break;
case JOIN_SINGLE:
builder = new JPQLJoinSelectSingleStatementBuilder(context);
+ break;
default:
break;
}
@@ -132,6 +133,7 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
case JOIN_COUNT:
JPQLJoinSelectContext joinCountContext = new JPQLJoinSelectContext(true);
contextBuilder = joinCountContext.new JPQLJoinContextBuilder();
+ break;
default:
break;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinSelectSingleStatementBuilder.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinSelectSingleStatementBuilder.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinSelectSingleStatementBuilder.java
index 3682205..4c64855 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinSelectSingleStatementBuilder.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinSelectSingleStatementBuilder.java
@@ -52,7 +52,7 @@ public class JPQLJoinSelectSingleStatementBuilder extends JPQLStatementBuilder {
jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(JPQLStatement.DELIMITER.SPACE);
- if (context.getJPAJoinClauses() != null && context.getJPAJoinClauses().size() > 0) {
+ if (context.getJPAJoinClauses() != null && !context.getJPAJoinClauses().isEmpty()) {
List<JPAJoinClause> joinClauseList = context.getJPAJoinClauses();
JPAJoinClause joinClause = joinClauseList.get(0);
String joinCondition = joinClause.getJoinCondition();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilder.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilder.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilder.java
index 246cffb..c2e3085 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilder.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLJoinStatementBuilder.java
@@ -61,7 +61,7 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(JPQLStatement.DELIMITER.SPACE);
- if (context.getJPAJoinClauses() != null && context.getJPAJoinClauses().size() > 0) {
+ if (context.getJPAJoinClauses() != null && !context.getJPAJoinClauses().isEmpty()) {
List<JPAJoinClause> joinClauseList = context.getJPAJoinClauses();
JPAJoinClause joinClause = joinClauseList.get(0);
String joinCondition = joinClause.getJoinCondition();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLSelectSingleStatementBuilder.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLSelectSingleStatementBuilder.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLSelectSingleStatementBuilder.java
index 0db1084..47e3f42 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLSelectSingleStatementBuilder.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/jpql/JPQLSelectSingleStatementBuilder.java
@@ -52,7 +52,7 @@ public class JPQLSelectSingleStatementBuilder extends JPQLStatementBuilder {
jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(fromClause);
- if (context.getKeyPredicates() != null && context.getKeyPredicates().size() > 0) {
+ if (context.getKeyPredicates() != null && !context.getKeyPredicates().isEmpty()) {
jpqlQuery.append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(JPQLStatement.KEYWORD.WHERE).append(JPQLStatement.DELIMITER.SPACE);
jpqlQuery.append(ODataExpressionParser
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociation.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociation.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociation.java
index 57b1ba3..bf5089d 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociation.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmAssociation.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map.Entry;
import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
import org.apache.olingo.odata2.api.edm.provider.Association;
@@ -91,8 +92,8 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssoc
@Override
public Association searchAssociation(final JPAEdmAssociationEndView view) {
if (view != null) {
- for (String key : associationMap.keySet()) {
- Association association = associationMap.get(key);
+ for (Entry<String, Association> assoc : associationMap.entrySet()) {
+ Association association = assoc.getValue();
if (association != null) {
if (view.compare(association.getEnd1(), association.getEnd2())) {
JPAEdmAssociationEndView associationEnd = associationEndMap.get(association.getName());
@@ -210,8 +211,8 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssoc
if (associationMap.size() == consistentAssociatonList.size()) {
isConsistent = true;
} else {
- for (String key : associationMap.keySet()) {
- Association association = associationMap.get(key);
+ for (Entry<String, Association> entry : associationMap.entrySet()) {
+ Association association = entry.getValue();
if (!consistentAssociatonList.contains(association)) {
consistentAssociatonList.add(association);
}
@@ -237,8 +238,8 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssoc
int count = 0;
AssociationEnd end1 = null;
AssociationEnd end2 = null;
- for (String key : associationMap.keySet()) {
- Association association = associationMap.get(key);
+ for (Entry<String, Association> entry : associationMap.entrySet()) {
+ Association association = entry.getValue();
if (association != null) {
end1 = association.getEnd1();
end2 = association.getEnd2();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFunctionImport.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFunctionImport.java
index e041c28..2c135ad 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFunctionImport.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmFunctionImport.java
@@ -151,7 +151,7 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
if (edmAnnotationFunctionImport != null && edmAnnotationFunctionImport.returnType() != null) {
FunctionImport functionImport = new FunctionImport();
- if (edmAnnotationFunctionImport.name().equals("")) {
+ if ("".equals(edmAnnotationFunctionImport.name())) {
functionImport.setName(method.getName());
} else {
functionImport.setName(edmAnnotationFunctionImport.name());
@@ -186,7 +186,7 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
if (element instanceof EdmFunctionImportParameter) {
EdmFunctionImportParameter annotation = (EdmFunctionImportParameter) element;
FunctionImportParameter functionImportParameter = new FunctionImportParameter();
- if (annotation.name().equals("")) {
+ if ("".equals(annotation.name())) {
throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_PARAM_NAME_EXP.addContent(method
.getDeclaringClass().getName(), method.getName()), null);
} else {
@@ -241,14 +241,14 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFu
if (returnType.type() == ReturnType.Type.ENTITY) {
String entitySet = edmAnnotationFunctionImport.entitySet();
- if (entitySet.equals("")) {
+ if ("".equals(entitySet)) {
throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_ENTITYSET_EXP, null);
}
functionImport.setEntitySet(entitySet);
}
Class<?> methodReturnType = method.getReturnType();
- if (methodReturnType == null || methodReturnType.getName().equals("void")) {
+ if (methodReturnType == null || "void".equals(methodReturnType.getName())) {
throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.addContent(method
.getDeclaringClass(), method.getName()), null);
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java
index f65cb01..4a5caf4 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/model/JPAEdmProperty.java
@@ -371,7 +371,7 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
ODataJPARuntimeException {
joinColumnNames = joinColumnNames == null ? new ArrayList<String[]>() : joinColumnNames;
String[] name = { null, null };
- name[0] = joinColumn.name().equals("") == true ? jpaAttribute.getName() : joinColumn.name();
+ name[0] = "".equals(joinColumn.name()) == true ? jpaAttribute.getName() : joinColumn.name();
EntityType<?> referencedEntityType = null;
if (jpaAttribute.isCollection()) {
@@ -381,7 +381,7 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
referencedEntityType = metaModel.entity(jpaAttribute.getJavaType());
}
- if (joinColumn.referencedColumnName().equals("")) {
+ if ("".equals(joinColumn.referencedColumnName())) {
for (Attribute<?, ?> referencedAttribute : referencedEntityType.getAttributes()) {
if (referencedAttribute.getPersistentAttributeType() == PersistentAttributeType.BASIC &&
((SingularAttribute<?, ?>) referencedAttribute).isId()) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
index 699cd52..0cc1e43 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
@@ -27,7 +27,6 @@ import java.util.regex.Pattern;
*
*/
public class ODataServiceVersion {
-
private static final Pattern DATASERVICEVERSIONPATTERN = Pattern.compile("(\\p{Digit}+\\.\\p{Digit}+)(:?;.*)?");
/**
@@ -42,6 +41,10 @@ public class ODataServiceVersion {
* ODataServiceVersion 3.0
*/
public static final String V30 = "3.0";
+
+ private ODataServiceVersion() {
+
+ }
/**
* Validates format and range of a data service version string.
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
index be139de..55ed99a 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
@@ -26,4 +26,7 @@ public class ODataHttpHeaders {
public static final String DATASERVICEVERSION = "DataServiceVersion";
+ private ODataHttpHeaders() {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
index efd83d8..7e08393 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
@@ -85,6 +85,10 @@ public enum EdmSimpleTypeKind {
* or parsing of {@link EdmLiteral}s.
*/
private static class SimpleTypeFacadeHolder {
+
static final EdmSimpleTypeFacade instance = RuntimeDelegate.getSimpleTypeFacade();
+ private SimpleTypeFacadeHolder() {
+
+ }
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
index f16ba58..b15ebb0 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
@@ -37,4 +37,8 @@ public class EdmTargetPath {
public static final String SYNDICATION_CONTRIBUTORURI = "SyndicationContributorUri";
public static final String SYNDICATION_SOURCE = "SyndicationSource";
public static final String SYNDICATION_SUMMARY = "SyndicationSummary";
+
+ private EdmTargetPath() {
+
+ }
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
index 9dbdc8a..31e3768 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
@@ -30,6 +30,9 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
*/
public class EdmProviderFactory {
+ private EdmProviderFactory() {
+
+ }
/**
* Creates and returns an edm provider.
* @param metadataXml a metadata xml input stream (means the metadata document)
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
index fe22695..a5a3291 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
@@ -176,7 +176,7 @@ public abstract class MessageReference {
public MessageReference updateContent(List<?> oldContent, Object... newContent) {
final List<Object> mergedContent = new ArrayList<Object>();
- if (oldContent != null && oldContent.size() > 0) {
+ if (oldContent != null && !oldContent.isEmpty()) {
mergedContent.addAll(oldContent);
}
mergedContent.addAll(Arrays.asList(newContent));
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
index e5ee823..982c23b 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
@@ -360,7 +360,7 @@ public abstract class ODataSingleProcessor implements MetadataProcessor, Service
final Edm edm = getContext().getService().getEntityDataModel();
//Service Document has version 1.0 specifically
- if (getContext().getHttpMethod().equals("HEAD")) {
+ if ("HEAD".equals(getContext().getHttpMethod())) {
return ODataResponse.header(ODataHttpHeaders.DATASERVICEVERSION, ODataServiceVersion.V10).build();
} else {
final String serviceRoot = getContext().getPathInfo().getServiceRoot().toASCIIString();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
index b56b4b3..f2acaf9 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
@@ -23,6 +23,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.olingo.odata2.api.uri.PathSegment;
@@ -45,10 +46,10 @@ public class ODataPathSegmentImpl implements PathSegment {
Map<String, List<String>> unmodifiableMap = new HashMap<String, List<String>>();
if (matrixParameters != null) {
- for (String key : matrixParameters.keySet()) {
- List<String> values = matrixParameters.get(key);
+ for (Entry<String, List<String>> matrixParam : matrixParameters.entrySet()) {
+ List<String> values = matrixParam.getValue();
List<String> tempList = values == null ? null: Collections.unmodifiableList(new ArrayList<String>(values));
- unmodifiableMap.put(key, tempList);
+ unmodifiableMap.put(matrixParam.getKey(), tempList);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
index f1f6547..844f41d 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
@@ -286,7 +286,6 @@ public class ODataRequestHandler {
throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
} else {
if (uriInfo.getFormat() != null) {
- // throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
throw new ODataBadRequestException(ODataBadRequestException.INVALID_SYNTAX);
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
index 07a9ead..fb4ddb7 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
@@ -179,11 +179,11 @@ public class ODataRequestImpl extends ODataRequest {
@Override
public ODataRequestBuilder queryParameters(final Map<String, String> queryParameters) {
- for (String key : queryParameters.keySet()) {
+ for (Entry<String, String> queryParam : queryParameters.entrySet()) {
List<String> parameterValues = new LinkedList<String>();
- parameterValues.add(queryParameters.get(key));
+ parameterValues.add(queryParam.getValue());
- allQueryParameters.put(key, parameterValues);
+ allQueryParameters.put(queryParam.getKey(), parameterValues);
}
return this;
}
@@ -240,8 +240,8 @@ public class ODataRequestImpl extends ODataRequest {
private <T, K> Map<T, K> convertMultiMaptoSingleMap(final Map<T, List<K>> multiMap) {
final Map<T, K> singleMap = new HashMap<T, K>();
- for (T key : multiMap.keySet()) {
- singleMap.put(key, multiMap.get(key).get(0));
+ for (Entry<T, List<K>> entry : multiMap.entrySet()) {
+ singleMap.put(entry.getKey(), entry.getValue().get(0));
}
return singleMap;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
index 0bf58ee..639f0f3 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
@@ -45,9 +45,6 @@ public class ODataResponseImpl extends ODataResponse {
public Object getEntity() {
// TODO: check type of entity??
// current default (defined by test cases is String)
-// if(entity instanceof InputStream) {
-// return BatchHelper.convertToString(this);
-// }
return entity;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
index 2b5f44f..3df9884 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchChangeSetPartImpl.java
@@ -30,7 +30,7 @@ public class BatchChangeSetPartImpl extends BatchChangeSetPart {
private Map<String, String> headers = new HashMap<String, String>();
private Object body;
private String uri;
- public String contentId;
+ public String cntId;
private static final String CHANGE_METHODS = "(PUT|POST|DELETE|MERGE|PATCH)";
@Override
@@ -72,7 +72,7 @@ public class BatchChangeSetPartImpl extends BatchChangeSetPart {
@Override
public String getContentId() {
- return contentId;
+ return cntId;
}
public class BatchChangeSetRequestBuilderImpl extends BatchChangeSetPartBuilder {
@@ -91,7 +91,7 @@ public class BatchChangeSetPartImpl extends BatchChangeSetPart {
BatchChangeSetPartImpl.this.headers = headers;
BatchChangeSetPartImpl.this.body = body;
BatchChangeSetPartImpl.this.uri = uri;
- BatchChangeSetPartImpl.this.contentId = contentId;
+ BatchChangeSetPartImpl.this.cntId = contentId;
return BatchChangeSetPartImpl.this;
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchBodyPart.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchBodyPart.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchBodyPart.java
index 68fea43..2fc2da2 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchBodyPart.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchBodyPart.java
@@ -53,19 +53,19 @@ public class BatchBodyPart implements BatchPart {
private boolean isChangeSet(final Header headers) throws BatchException {
final List<String> contentTypes = headers.getHeaders(HttpHeaders.CONTENT_TYPE);
- boolean isChangeSet = false;
+ boolean isChgSet = false;
- if (contentTypes.size() == 0) {
+ if (contentTypes.isEmpty()) {
throw new BatchException(BatchException.MISSING_CONTENT_TYPE.addContent(headers.getLineNumber()));
}
for (String contentType : contentTypes) {
if (isContentTypeMultiPartMixed(contentType)) {
- isChangeSet = true;
+ isChgSet = true;
}
}
- return isChangeSet;
+ return isChgSet;
}
private boolean isContentTypeMultiPartMixed(final String contentType) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchLineReader.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchLineReader.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchLineReader.java
index 11cb947..a418ffb 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchLineReader.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchLineReader.java
@@ -143,7 +143,7 @@ public class BatchLineReader {
return null;
}
- ByteBuffer buffer = ByteBuffer.allocate(BUFFER_SIZE);
+ ByteBuffer buf = ByteBuffer.allocate(BUFFER_SIZE);
boolean foundLineEnd = false; // EOF will be considered as line ending
while (!foundLineEnd) {
@@ -156,8 +156,8 @@ public class BatchLineReader {
if (!foundLineEnd) {
byte currentChar = this.buffer[offset++];
- buffer = grantBuffer(buffer);
- buffer.put(currentChar);
+ buf = grantBuffer(buf);
+ buf.put(currentChar);
if (currentChar == LF) {
foundLineEnd = true;
@@ -172,22 +172,22 @@ public class BatchLineReader {
// Check if there is at least one character
if (limit != EOF && this.buffer[offset] == LF) {
- buffer = grantBuffer(buffer);
- buffer.put(LF);
+ buf = grantBuffer(buf);
+ buf.put(LF);
offset++;
}
}
}
}
- if(buffer.position() == 0) {
+ if(buf.position() == 0) {
return null;
} else {
String currentLine;
if(readState.isReadBody()) {
- currentLine = new String(buffer.array(), 0, buffer.position(), getCurrentCharset());
+ currentLine = new String(buf.array(), 0, buf.position(), getCurrentCharset());
} else {
- currentLine = new String(buffer.array(), 0, buffer.position(), DEFAULT_CHARSET);
+ currentLine = new String(buf.array(), 0, buf.position(), DEFAULT_CHARSET);
}
updateCurrentCharset(currentLine);
return currentLine;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchParserCommon.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchParserCommon.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchParserCommon.java
index 7f5cc12..bdb305f 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchParserCommon.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchParserCommon.java
@@ -72,6 +72,10 @@ public class BatchParserCommon {
Pattern.CASE_INSENSITIVE);
public static final Pattern PATTERN_RELATIVE_URI = Pattern.compile("([^/][^?]*)(\\?.*)?");
+ private BatchParserCommon() {
+
+ }
+
public static String trimLineListToLength(final List<Line> list, final int length) {
final String message = lineListToString(list);
final int lastIndex = Math.min(length, message.length());
@@ -146,9 +150,9 @@ public class BatchParserCommon {
}
}
- final int lineNumber = (message.size() > 0) ? message.get(0).getLineNumber() : 0;
+ final int lineNumber = (!message.isEmpty()) ? message.get(0).getLineNumber() : 0;
// Remove preamble
- if (messageParts.size() > 0) {
+ if (!messageParts.isEmpty()) {
messageParts.remove(0);
} else {
@@ -159,7 +163,7 @@ public class BatchParserCommon {
throw new BatchException(BatchException.MISSING_CLOSE_DELIMITER.addContent(lineNumber));
}
- if (messageParts.size() == 0) {
+ if (messageParts.isEmpty()) {
throw new BatchException(BatchException.NO_MATCH_WITH_BOUNDARY_STRING
.addContent(boundary).addContent(lineNumber));
}
@@ -168,7 +172,7 @@ public class BatchParserCommon {
}
private static void removeEndingCRLFFromList(final List<Line> list) {
- if (list.size() > 0) {
+ if (!list.isEmpty()) {
Line lastLine = list.remove(list.size() - 1);
list.add(removeEndingCRLF(lastLine));
}
@@ -186,7 +190,7 @@ public class BatchParserCommon {
}
public static Header consumeHeaders(final List<Line> remainingMessage) throws BatchException {
- final int headerLineNumber = remainingMessage.size() != 0 ? remainingMessage.get(0).getLineNumber() : 0;
+ final int headerLineNumber = !remainingMessage.isEmpty() ? remainingMessage.get(0).getLineNumber() : 0;
final Header headers = new Header(headerLineNumber);
final Iterator<Line> iter = remainingMessage.iterator();
final AcceptParser acceptParser = new AcceptParser();
@@ -227,11 +231,11 @@ public class BatchParserCommon {
public static void consumeBlankLine(final List<Line> remainingMessage, final boolean isStrict)
throws BatchException {
- if (remainingMessage.size() > 0 && remainingMessage.get(0).toString().matches("\\s*\r\n\\s*")) {
+ if (!remainingMessage.isEmpty() && remainingMessage.get(0).toString().matches("\\s*\r\n\\s*")) {
remainingMessage.remove(0);
} else {
if (isStrict) {
- final int lineNumber = (remainingMessage.size() > 0) ? remainingMessage.get(0).getLineNumber() : 0;
+ final int lineNumber = (!remainingMessage.isEmpty()) ? remainingMessage.get(0).getLineNumber() : 0;
throw new BatchException(BatchException.MISSING_BLANK_LINE.addContent("[None]").addContent(lineNumber));
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchQueryOperation.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchQueryOperation.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchQueryOperation.java
index 748f7d7..1e62f5a 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchQueryOperation.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchQueryOperation.java
@@ -46,13 +46,13 @@ public class BatchQueryOperation implements BatchPart {
}
protected Line consumeHttpStatusLine(final List<Line> message) throws BatchException {
- if (message.size() > 0 && !message.get(0).toString().trim().equals("")) {
+ if (!message.isEmpty() && !"".equals(message.get(0).toString().trim())) {
final Line method = message.get(0);
message.remove(0);
return method;
} else {
- final int line = (message.size() > 0) ? message.get(0).getLineNumber() : 0;
+ final int line = (!message.isEmpty()) ? message.get(0).getLineNumber() : 0;
throw new BatchException(BatchException.MISSING_METHOD.addContent(line));
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
index 5a2b85b..36eeb05 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchRequestTransformator.java
@@ -138,12 +138,12 @@ public class BatchRequestTransformator implements BatchTransformator {
final HeaderField operationHeader = operation.getHeaders().getHeaderField(BatchHelper.HTTP_CONTENT_ID);
final HeaderField parentHeader = parentPart.getHeaders().getHeaderField(BatchHelper.HTTP_CONTENT_ID);
- if (operationHeader != null && operationHeader.getValues().size() != 0) {
+ if (operationHeader != null && !operationHeader.getValues().isEmpty()) {
headers.addHeader(BatchHelper.REQUEST_HEADER_CONTENT_ID, operationHeader.getValues(), operationHeader
.getLineNumber());
}
- if (parentHeader != null && parentHeader.getValues().size() != 0) {
+ if (parentHeader != null && !parentHeader.getValues().isEmpty()) {
headers.addHeader(BatchHelper.MIME_HEADER_CONTENT_ID, parentHeader.getValues(), parentHeader.getLineNumber());
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchResponseTransformator.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchResponseTransformator.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchResponseTransformator.java
index 5e4198c..190b6f7 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchResponseTransformator.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchResponseTransformator.java
@@ -36,12 +36,11 @@ public class BatchResponseTransformator implements BatchTransformator {
@Override
public List<BatchParserResult> transform(final BatchBodyPart bodyPart, final PathInfo pathInfo, final String baseUri)
throws BatchException {
- return processQueryOperation(bodyPart, pathInfo, baseUri);
+ return processQueryOperation(bodyPart);
}
- private List<BatchParserResult> processQueryOperation(final BatchBodyPart bodyPart,
- final PathInfo pathInfo,
- final String baseUri) throws BatchException {
+ private List<BatchParserResult> processQueryOperation(final BatchBodyPart bodyPart)
+ throws BatchException {
List<BatchParserResult> resultList = new ArrayList<BatchParserResult>();
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchTransformatorCommon.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchTransformatorCommon.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchTransformatorCommon.java
index 11e0380..5a31d0e 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchTransformatorCommon.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/BatchTransformatorCommon.java
@@ -43,7 +43,7 @@ public class BatchTransformatorCommon {
public static void validateContentType(final Header headers) throws BatchException {
List<String> contentTypes = headers.getHeaders(HttpHeaders.CONTENT_TYPE);
- if (contentTypes.size() == 0) {
+ if (contentTypes.isEmpty()) {
throw new BatchException(BatchException.MISSING_CONTENT_TYPE);
}
if (!headers.isHeaderMatching(HttpHeaders.CONTENT_TYPE, BatchParserCommon.PATTERN_MULTIPART_MIXED)
@@ -194,9 +194,9 @@ public class BatchTransformatorCommon {
}
private PathInfo parseUri(final String uri) throws BatchException {
- PathInfoImpl pathInfo = new PathInfoImpl();
- pathInfo.setServiceRoot(batchRequestPathInfo.getServiceRoot());
- pathInfo.setPrecedingPathSegment(batchRequestPathInfo.getPrecedingSegments());
+ PathInfoImpl pInfo = new PathInfoImpl();
+ pInfo.setServiceRoot(batchRequestPathInfo.getServiceRoot());
+ pInfo.setPrecedingPathSegment(batchRequestPathInfo.getPrecedingSegments());
try {
final URI uriObject = new URI(uri);
@@ -217,10 +217,10 @@ public class BatchTransformatorCommon {
final String odataPathSegmentsAsString = uriParts.group(1);
final String queryParametersAsString = uriParts.group(2) != null ? uriParts.group(2) : "";
- pathInfo.setODataPathSegment(parseODataPathSegments(odataPathSegmentsAsString));
+ pInfo.setODataPathSegment(parseODataPathSegments(odataPathSegmentsAsString));
if (!odataPathSegmentsAsString.startsWith("$")) {
String requestUri = requestBaseUri + "/" + odataPathSegmentsAsString + queryParametersAsString;
- pathInfo.setRequestUri(new URI(requestUri));
+ pInfo.setRequestUri(new URI(requestUri));
}
} else {
@@ -230,7 +230,7 @@ public class BatchTransformatorCommon {
throw new BatchException(BatchException.INVALID_URI.addContent(statusLine.getLineNumber()), e);
}
- return pathInfo;
+ return pInfo;
}
private List<PathSegment> parseODataPathSegments(final String odataPathSegmentsAsString) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/Header.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/Header.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/Header.java
index ba44b25..3a4c282 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/Header.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/v2/Header.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.regex.Pattern;
public class Header implements Cloneable {
@@ -95,9 +96,9 @@ public class Header implements Cloneable {
public Map<String, String> toSingleMap() {
final Map<String, String> singleMap = new HashMap<String, String>();
- for (final String key : headers.keySet()) {
- HeaderField field = headers.get(key);
- singleMap.put(field.getFieldName(), getHeader(key));
+ for (Entry<String, HeaderField> header : headers.entrySet()) {
+ HeaderField field = header.getValue();
+ singleMap.put(field.getFieldName(), getHeader(header.getKey()));
}
return singleMap;
@@ -106,8 +107,8 @@ public class Header implements Cloneable {
public Map<String, List<String>> toMultiMap() {
final Map<String, List<String>> singleMap = new HashMap<String, List<String>>();
- for (final String key : headers.keySet()) {
- HeaderField field = headers.get(key);
+ for (Entry<String, HeaderField> header : headers.entrySet()) {
+ HeaderField field = header.getValue();
singleMap.put(field.getFieldName(), field.getValues());
}
@@ -129,8 +130,8 @@ public class Header implements Cloneable {
public Header clone() {
final Header newInstance = new Header(lineNumber);
- for (final String key : headers.keySet()) {
- newInstance.headers.put(key, headers.get(key).clone());
+ for (Entry<String, HeaderField> header : headers.entrySet()) {
+ newInstance.headers.put(header.getKey(), header.getValue().clone());
}
return newInstance;
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
index 6a797ad..8bb5bfd 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
@@ -766,13 +766,14 @@ public class ContentType {
} else {
sb.append(type).append(TYPE_SUBTYPE_SEPARATOR).append(subtype);
}
-
- for (String key : parameters.keySet()) {
- if (isParameterAllowed(key)) {
- String value = parameters.get(key);
- sb.append(";").append(key).append("=").append(value);
+
+ for (Entry<String, String> parameter : parameters.entrySet()) {
+ if (isParameterAllowed(parameter.getKey())) {
+ String value = parameter.getValue();
+ sb.append(";").append(parameter.getKey()).append("=").append(value);
}
}
+
return sb.toString();
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
index 15e6b2f..ce7d1b4 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
@@ -23,6 +23,7 @@ import java.io.Writer;
import java.net.URI;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
@@ -61,8 +62,8 @@ public class DebugInfoRequest implements DebugInfo {
.name("headers")
.beginObject();
boolean first = true;
- for (final String name : headers.keySet()) {
- for (final String value : headers.get(name)) {
+ for (final Entry<String, List<String>> header : headers.entrySet()) {
+ for (final String value : header.getValue()) {
if (value == null) {
continue;
}
@@ -70,7 +71,7 @@ public class DebugInfoRequest implements DebugInfo {
jsonStreamWriter.separator();
}
first = false;
- jsonStreamWriter.namedStringValue(name, value);
+ jsonStreamWriter.namedStringValue(header.getKey(), value);
}
}
jsonStreamWriter.endObject();
@@ -91,10 +92,10 @@ public class DebugInfoRequest implements DebugInfo {
.append("<table>\n<thead>\n")
.append("<tr><th class=\"name\">Name</th><th class=\"value\">Value</th></tr>\n")
.append("</thead>\n<tbody>\n");
- for (final String name : headers.keySet()) {
- for (final String value : headers.get(name)) {
+ for (final Entry<String, List<String>> header : headers.entrySet()) {
+ for (final String value : header.getValue()) {
if (value != null) {
- writer.append("<tr><td class=\"name\">").append(name).append("</td>")
+ writer.append("<tr><td class=\"name\">").append(header.getKey()).append("</td>")
.append("<td class=\"value\">").append(ODataDebugResponseWrapper.escapeHtml(value))
.append("</td></tr>\n");
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
index 23f5f40..ea379c2 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
@@ -30,6 +30,7 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest;
@@ -242,8 +243,8 @@ public class ODataDebugResponseWrapper {
throws IOException {
jsonStreamWriter.beginObject();
boolean first = true;
- for (final String name : entries.keySet()) {
- final String value = entries.get(name);
+ for (final Entry<String, String> entry : entries.entrySet()) {
+ final String value = entries.get(entry.getKey());
if (value == null) {
continue;
}
@@ -251,7 +252,7 @@ public class ODataDebugResponseWrapper {
jsonStreamWriter.separator();
}
first = false;
- jsonStreamWriter.namedStringValue(name, value);
+ jsonStreamWriter.namedStringValue(entry.getKey(), value);
}
jsonStreamWriter.endObject();
}
@@ -260,10 +261,10 @@ public class ODataDebugResponseWrapper {
writer.append("<table>\n<thead>\n")
.append("<tr><th class=\"name\">Name</th><th class=\"value\">Value</th></tr>\n")
.append("</thead>\n<tbody>\n");
- for (final String name : entries.keySet()) {
- final String value = entries.get(name);
+ for (final Entry<String, String> entry : entries.entrySet()) {
+ final String value = entry.getValue();
if (value != null) {
- writer.append("<tr><td class=\"name\">").append(name).append("</td>")
+ writer.append("<tr><td class=\"name\">").append(entry.getKey()).append("</td>")
.append("<td class=\"value\">")
.append(ODataDebugResponseWrapper.escapeHtml(value))
.append("</td></tr>\n");
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
index cfc1a67..9f5abff 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
@@ -88,7 +88,7 @@ public class EdmDateTimeOffset extends AbstractSimpleType {
timeZone += matcher.group(2) + String.valueOf(offsetInMinutes / 60)
+ ":" + String.format("%02d", offsetInMinutes % 60);
// Convert the local-time milliseconds to UTC.
- millis -= (matcher.group(2).equals("+") ? 1 : -1) * offsetInMinutes * 60 * 1000;
+ millis -= ("+".equals(matcher.group(2)) ? 1 : -1) * offsetInMinutes * 60 * 1000;
}
}
dateTimeValue = Calendar.getInstance(TimeZone.getTimeZone(timeZone));
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
index b5d5adf..52f7c70 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
@@ -91,7 +91,7 @@ public class EdmDecimal extends AbstractSimpleType {
final Matcher matcher = PATTERN.matcher(value);
matcher.matches();
- final int significantIntegerDigits = matcher.group(1).equals("0") ? 0 : matcher.group(1).length();
+ final int significantIntegerDigits = "0".equals(matcher.group(1)) ? 0 : matcher.group(1).length();
final int decimals = matcher.group(2) == null ? 0 : matcher.group(2).length();
return (facets.getPrecision() == null || facets.getPrecision() >= significantIntegerDigits + decimals)
&& (facets.getScale() == null || facets.getScale() >= decimals);
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
index a05e9c3..5f56e89 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
@@ -70,11 +70,11 @@ public class EdmDouble extends AbstractSimpleType {
String valueString = value;
Double result = null;
// Handle special values first.
- if (value.equals("-INF")) {
+ if ("-INF".equals(value)) {
result = Double.NEGATIVE_INFINITY;
- } else if (value.equals("INF")) {
+ } else if ("INF".equals(value)) {
result = Double.POSITIVE_INFINITY;
- } else if (value.equals("NaN")) {
+ } else if ("NaN".equals(value)) {
result = Double.NaN;
} else {
// Now only "normal" numbers remain.
@@ -166,7 +166,7 @@ public class EdmDouble extends AbstractSimpleType {
@Override
public String toUriLiteral(final String literal) {
- return literal.equals("-INF") || literal.equals("INF") || literal.equals("NaN") ?
+ return "-INF".equals(literal) || "INF".equals(literal) || "NaN".equals(literal) ?
literal : literal + "D";
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
index 4a237ef..25a5dc8 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
@@ -86,7 +86,7 @@ public class EdmSimpleTypeFacadeImpl implements EdmSimpleTypeFacade {
if (uriLiteral.endsWith("D") || uriLiteral.endsWith("d")) {
return createEdmLiteral(EdmSimpleTypeKind.Double, uriLiteral, 0, 1);
}
- if (uriLiteral.equals("-INF") || uriLiteral.equals("INF") || uriLiteral.equals("NaN")) {
+ if ("-INF".equals(uriLiteral) || "INF".equals(uriLiteral) || "NaN".equals(uriLiteral)) {
return new EdmLiteral(getEdmSimpleType(EdmSimpleTypeKind.Single), uriLiteral);
}
if (uriLiteral.endsWith("F") || uriLiteral.endsWith("f")) {
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
index 9c27fd2..466f48c 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
@@ -69,11 +69,11 @@ public class EdmSingle extends AbstractSimpleType {
String valueString = value;
Float result = null;
// Handle special values first.
- if (value.equals("-INF")) {
+ if ("-INF".equals(value)) {
result = Float.NEGATIVE_INFINITY;
- } else if (value.equals("INF")) {
+ } else if ("INF".equals(value)) {
result = Float.POSITIVE_INFINITY;
- } else if (value.equals("NaN")) {
+ } else if ("NaN".equals(value)) {
result = Float.NaN;
} else {
// Now only "normal" numbers remain.
@@ -167,7 +167,7 @@ public class EdmSingle extends AbstractSimpleType {
@Override
public String toUriLiteral(final String literal) {
- return literal.equals("-INF") || literal.equals("INF") || literal.equals("NaN") ?
+ return "-INF".equals(literal) || "INF".equals(literal) || "NaN".equals(literal) ?
literal : literal + "F";
}
}
http://git-wip-us.apache.org/repos/asf/olingo-odata2/blob/aedda745/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
index 1472388..5096fce 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
@@ -209,16 +209,16 @@ public class EdmEntityContainerImplProv implements EdmEntityContainer, EdmAnnota
@Override
public List<EdmEntitySet> getEntitySets() throws EdmException {
try {
- List<EdmEntitySet> edmEntitySets = new ArrayList<EdmEntitySet>();
- List<EntityContainer> entityContainerHierachy = getEntityContainerHierachy();
- for (EntityContainer entityContainer : entityContainerHierachy) {
+ List<EdmEntitySet> edmEntitySetsList = new ArrayList<EdmEntitySet>();
+ List<EntityContainer> entityContainerHierachyList = getEntityContainerHierachy();
+ for (EntityContainer entityContainer : entityContainerHierachyList) {
List<EntitySet> entitySets = entityContainer.getEntitySets();
for (EntitySet entitySet : entitySets) {
EdmEntitySet ees = createEntitySet(entitySet);
- edmEntitySets.add(ees);
+ edmEntitySetsList.add(ees);
}
}
- return edmEntitySets;
+ return edmEntitySetsList;
} catch (ODataException e) {
throw new EdmException(EdmException.PROVIDERPROBLEM, e);
}
@@ -228,16 +228,16 @@ public class EdmEntityContainerImplProv implements EdmEntityContainer, EdmAnnota
public List<EdmAssociationSet> getAssociationSets() throws EdmException {
try {
List<EntityContainer> containers = getEntityContainerHierachy();
- List<EdmAssociationSet> edmAssociationSets = new ArrayList<EdmAssociationSet>();
+ List<EdmAssociationSet> edmAssociationSetsList = new ArrayList<EdmAssociationSet>();
for (EntityContainer entityContainer : containers) {
List<AssociationSet> associationSets = entityContainer.getAssociationSets();
for (AssociationSet associationSet : associationSets) {
EdmAssociationSet eas = createAssociationSet(associationSet);
- edmAssociationSets.add(eas);
+ edmAssociationSetsList.add(eas);
}
}
- return edmAssociationSets;
+ return edmAssociationSetsList;
} catch (ODataException e) {
throw new EdmException(EdmException.PROVIDERPROBLEM, e);
}