Repository: olingo-odata4 Updated Branches: refs/heads/master e5fe04aee -> 0938f1179
[OLINGO-659] Minor code clean up, javadoc and typo fixes Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/0938f117 Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/0938f117 Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/0938f117 Branch: refs/heads/master Commit: 0938f1179df9e22710e60b06c1e240b2ab4d9db0 Parents: e5fe04a Author: Michael Bolz <[email protected]> Authored: Tue Jun 16 21:20:02 2015 +0200 Committer: Michael Bolz <[email protected]> Committed: Tue Jun 16 21:20:02 2015 +0200 ---------------------------------------------------------------------- .../apache/olingo/server/api/uri/UriInfo.java | 19 +++++++++---------- .../olingo/server/api/uri/UriInfoEntityId.java | 13 ++++++------- .../olingo/server/api/uri/UriInfoMetadata.java | 4 ++-- .../olingo/server/api/uri/UriParameter.java | 11 +++++------ .../server/api/uri/UriResourceFunction.java | 2 +- .../server/api/uri/UriResourceLambdaAll.java | 5 ++--- .../server/api/uri/UriResourceLambdaAny.java | 4 ++-- .../api/uri/UriResourceLambdaVariable.java | 3 +-- .../server/api/uri/UriResourceNavigation.java | 2 +- .../core/uri/UriResourceLambdaAnyImpl.java | 2 +- .../server/core/uri/UriResourceWithKeysImpl.java | 17 +++++++++-------- .../server/core/uri/UriResourceImplTest.java | 2 +- .../core/uri/testutil/FilterTreeToText.java | 2 +- .../core/uri/testutil/ResourceValidator.java | 2 +- 14 files changed, 42 insertions(+), 46 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java index c7f1e7e..ead6113 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfo.java @@ -31,22 +31,21 @@ public interface UriInfo extends UriInfoService, UriInfoAll, UriInfoBatch, UriInfoCrossjoin, UriInfoEntityId, UriInfoMetadata, UriInfoResource { - public UriInfoKind getKind(); + UriInfoKind getKind(); - public UriInfoService asUriInfoService(); + UriInfoService asUriInfoService(); - public UriInfoAll asUriInfoAll(); + UriInfoAll asUriInfoAll(); - public UriInfoBatch asUriInfoBatch(); + UriInfoBatch asUriInfoBatch(); - public UriInfoCrossjoin asUriInfoCrossjoin(); + UriInfoCrossjoin asUriInfoCrossjoin(); - public UriInfoEntityId asUriInfoEntityId(); + UriInfoEntityId asUriInfoEntityId(); - public UriInfoMetadata asUriInfoMetadata(); + UriInfoMetadata asUriInfoMetadata(); - public UriInfoResource asUriInfoResource(); - - public Collection<SystemQueryOption> getSystemQueryOptions(); + UriInfoResource asUriInfoResource(); + Collection<SystemQueryOption> getSystemQueryOptions(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java index 6736ddc..2579b6d 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoEntityId.java @@ -36,33 +36,32 @@ public interface UriInfoEntityId { /** * @return List of custom query options used in the URI */ - public List<CustomQueryOption> getCustomQueryOptions(); + List<CustomQueryOption> getCustomQueryOptions(); /** * Behind $entity a optional type cast can be used in the URI. * For example: http://.../serviceroot/$entity/namespace.entitytype * @return Type cast if found, otherwise null */ - public EdmEntityType getEntityTypeCast(); + EdmEntityType getEntityTypeCast(); /** * @return Object containing information of the $expand option */ - public ExpandOption getExpandOption(); + ExpandOption getExpandOption(); /** * @return Object containing information of the $format option */ - public FormatOption getFormatOption(); + FormatOption getFormatOption(); /** * @return Object containing information of the $id option */ - public IdOption getIdOption(); + IdOption getIdOption(); /** * @return Object containing information of the $select option */ - public SelectOption getSelectOption(); - + SelectOption getSelectOption(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java index b16f76c..7bf8d91 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriInfoMetadata.java @@ -29,11 +29,11 @@ public interface UriInfoMetadata { /** * @return Object containing information of the $id option */ - public FormatOption getFormatOption(); + FormatOption getFormatOption(); /** * @return Object containing information of the URI fragment */ - public String getFragment(); + String getFragment(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java index db2f9d0..ab8bfec 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriParameter.java @@ -28,26 +28,25 @@ public interface UriParameter { /** * @return Alias name if the parameters values is an alias, otherwise null */ - public String getAlias(); + String getAlias(); /** * @return Text of the parameters value */ - public String getText(); + String getText(); /** * @return If the parameters value is a expression and expression is returned, otherwise null */ - public Expression getExpression(); + Expression getExpression(); /** * @return Name of the parameter */ - public String getName(); + String getName(); /** * @return Name of the referenced property when referential constrains are used */ - public String getReferencedProperty(); - + String getReferencedProperty(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java index d92dd89..f509bd7 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceFunction.java @@ -45,7 +45,7 @@ public interface UriResourceFunction extends UriResourcePartTyped { EdmFunctionImport getFunctionImport(); /** - * @return Key predicates if used, otherwise null + * @return Key predicates if used, otherwise an empty list */ List<UriParameter> getKeyPredicates(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java index cbb9edf..2abe93e 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAll.java @@ -29,11 +29,10 @@ public interface UriResourceLambdaAll extends UriResourcePartTyped { /** * @return Name of the lambda variable */ - public String getLambdaVariable(); + String getLambdaVariable(); /** * @return Lambda expression */ - public Expression getExpression(); - + Expression getExpression(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java index 8908284..198ac3c 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaAny.java @@ -29,11 +29,11 @@ public interface UriResourceLambdaAny extends UriResourcePartTyped { /** * @return Name of the lambda variable */ - public String getLamdaVariable(); + String getLambdaVariable(); /** * @return Lambda expression */ - public Expression getExpression(); + Expression getExpression(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java index 67a5d3d..376e88f 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceLambdaVariable.java @@ -27,6 +27,5 @@ public interface UriResourceLambdaVariable extends UriResourcePartTyped { /** * @return Name of the lambda variable */ - public String getVariableName(); - + String getVariableName(); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java ---------------------------------------------------------------------- diff --git a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java index 3ef4c05..fab09a3 100644 --- a/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java +++ b/lib/server-api/src/main/java/org/apache/olingo/server/api/uri/UriResourceNavigation.java @@ -35,7 +35,7 @@ public interface UriResourceNavigation extends UriResourcePartTyped { EdmNavigationProperty getProperty(); /** - * @return Key predicates if used, otherwise null + * @return Key predicates if used, otherwise an empty list */ List<UriParameter> getKeyPredicates(); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/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 e66a37c..81059dd 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 @@ -50,7 +50,7 @@ public class UriResourceLambdaAnyImpl extends UriResourceTypedImpl implements Ur } @Override - public String getLamdaVariable() { + public String getLambdaVariable() { return lambdaVariable; } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java ---------------------------------------------------------------------- diff --git a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java index aef5800..320ad0d 100644 --- a/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java +++ b/lib/server-core/src/main/java/org/apache/olingo/server/core/uri/UriResourceWithKeysImpl.java @@ -73,29 +73,30 @@ public abstract class UriResourceWithKeysImpl extends UriResourceImpl implements @Override public String toString(final boolean includeFilters) { - if (includeFilters == true) { - String tmp = ""; + if (includeFilters) { + StringBuilder tmp = new StringBuilder(); if (collectionTypeFilter != null) { - tmp += getFQN(collectionTypeFilter).toString(); + tmp.append(getFQN(collectionTypeFilter)); } if (entryTypeFilter != null) { if (tmp.length() == 0) { - tmp = getFQN(entryTypeFilter).toString(); + tmp.append(getFQN(entryTypeFilter)); } else { - tmp += "/()" + getFQN(entryTypeFilter).toString(); + tmp.append("/()").append(getFQN(entryTypeFilter)); } } + if (tmp.length() != 0) { - return toString() + "/" + tmp; + return toString() + "/" + tmp.toString(); } } return toString(); } - private FullQualifiedName getFQN(final EdmType type) { - return new FullQualifiedName(type.getNamespace(), type.getName()); + private String getFQN(final EdmType type) { + return new FullQualifiedName(type.getNamespace(), type.getName()).getFullQualifiedNameAsString(); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java index 1945fe5..e9f16ea 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/UriResourceImplTest.java @@ -125,7 +125,7 @@ public class UriResourceImplTest { assertEquals(false, impl.isCollection()); assertEquals(expression, impl.getExpression()); - assertEquals("A", impl.getLamdaVariable()); + assertEquals("A", impl.getLambdaVariable()); assertEquals(EdmPrimitiveTypeFactory.getInstance(EdmPrimitiveTypeKind.Boolean), impl.getType()); assertEquals("any", impl.toString()); } http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/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 d24c77f..7b0752f 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 @@ -97,7 +97,7 @@ public class FilterTreeToText implements ExpressionVisitor<String> { tmp = visitLambdaExpression("ALL", all.getLambdaVariable(), all.getExpression()); } else if (item instanceof UriResourceLambdaAny) { UriResourceLambdaAny any = (UriResourceLambdaAny) item; - tmp = visitLambdaExpression("ANY", any.getLamdaVariable(), any.getExpression()); + tmp = visitLambdaExpression("ANY", any.getLambdaVariable(), any.getExpression()); } else if (item instanceof UriResourcePartTyped) { UriResourcePartTyped typed = (UriResourcePartTyped) item; tmp = typed.toString(true); http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/0938f117/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java ---------------------------------------------------------------------- diff --git a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java index 817602a..f6c9937 100644 --- a/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java +++ b/lib/server-test/src/test/java/org/apache/olingo/server/core/uri/testutil/ResourceValidator.java @@ -224,7 +224,7 @@ public class ResourceValidator implements TestValidator { if (uriPathInfo.getKind() == UriResourceKind.lambdaAll) { actualVar = ((UriResourceLambdaAllImpl) uriPathInfo).getLambdaVariable(); } else if (uriPathInfo.getKind() == UriResourceKind.lambdaAny) { - actualVar = ((UriResourceLambdaAnyImpl) uriPathInfo).getLamdaVariable(); + actualVar = ((UriResourceLambdaAnyImpl) uriPathInfo).getLambdaVariable(); } else { fail("invalid resource kind: " + uriPathInfo.getKind().toString()); }
