You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2014/01/30 10:31:59 UTC
git commit: [OLINGO-62] Cleanup
Updated Branches:
refs/heads/master dbd014631 -> 5d98f9097
[OLINGO-62] Cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/commit/5d98f909
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/tree/5d98f909
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/diff/5d98f909
Branch: refs/heads/master
Commit: 5d98f9097eab823a49acad990e3cf57a5136439e
Parents: dbd0146
Author: Christian Amend <ch...@apache.org>
Authored: Thu Jan 30 10:31:19 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Thu Jan 30 10:31:19 2014 +0100
----------------------------------------------------------------------
.../olingo/odata4/commons/core/edm/EdmImpl.java | 9 ++++----
.../core/edm/provider/EdmComplexTypeImpl.java | 1 -
.../core/edm/provider/EdmEntitySetInfoImpl.java | 2 +-
.../core/edm/provider/EdmEntityTypeImpl.java | 3 +--
.../commons/core/edm/provider/EdmEnumImpl.java | 12 ++++++-----
.../edm/provider/EdmFunctionImportInfoImpl.java | 2 +-
.../core/edm/provider/EdmProviderImpl.java | 4 ++--
.../core/edm/provider/EdmSingletonInfoImpl.java | 2 +-
.../edm/provider/EdmStructuralTypeImpl.java | 2 +-
.../edm/provider/EdmTypeDefinitionImpl.java | 2 +-
.../commons/core/edm/ActionMapKeyTest.java | 3 ++-
.../commons/core/edm/EdmImplCachingTest.java | 4 ++--
.../commons/core/edm/EdmImplCallCreateTest.java | 15 ++++++-------
.../core/edm/provider/EdmActionImplTest.java | 3 ++-
.../provider/EdmEntityContainerImplTest.java | 10 +++++----
.../edm/provider/EdmEntitySetInfoImplTest.java | 2 +-
.../edm/provider/EdmEntityTypeImplTest.java | 4 ++--
.../commons/core/edm/provider/EdmEnumTest.java | 2 +-
.../provider/EdmFunctionImportInfoImplTest.java | 2 +-
.../provider/EdmNavigationPropertyImplTest.java | 2 +-
.../core/edm/provider/EdmProviderImplTest.java | 20 +++++++++---------
.../edm/provider/EdmReturnTypeImplTest.java | 3 ++-
.../provider/EdmServiceMetadataImplTest.java | 8 +++----
.../core/edm/provider/EdmSingletonImplTest.java | 4 ++--
.../edm/provider/EdmTypeDefinitionImplTest.java | 22 ++++++++++----------
25 files changed, 75 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java
index b7d8ed8..69867e7 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java
@@ -149,7 +149,7 @@ public abstract class EdmImpl implements Edm {
final FullQualifiedName bindingParameterTypeName,
final Boolean isBindingParameterCollection, final List<String> parameterNames) {
FullQualifiedName functionFqn = resolvePossibleAlias(functionName);
- if(bindingParameterTypeName == null){
+ if (bindingParameterTypeName == null) {
FunctionMapKey key =
new FunctionMapKey(functionFqn, bindingParameterTypeName, isBindingParameterCollection, parameterNames);
EdmFunction function = unboundFunctions.get(key);
@@ -160,7 +160,7 @@ public abstract class EdmImpl implements Edm {
}
}
return function;
- }else{
+ } else {
FullQualifiedName bindingParameterTypeFqn = resolvePossibleAlias(bindingParameterTypeName);
FunctionMapKey key =
new FunctionMapKey(functionFqn, bindingParameterTypeFqn, isBindingParameterCollection, parameterNames);
@@ -214,10 +214,11 @@ public abstract class EdmImpl implements Edm {
protected abstract EdmComplexType createComplexType(FullQualifiedName complexTypeName);
protected abstract EdmAction createUnboundAction(FullQualifiedName actionName);
-
+
protected abstract EdmFunction createUnboundFunction(FullQualifiedName functionName, List<String> parameterNames);
- protected abstract EdmAction createBoundAction(FullQualifiedName actionName, FullQualifiedName bindingParameterTypeName,
+ protected abstract EdmAction createBoundAction(FullQualifiedName actionName,
+ FullQualifiedName bindingParameterTypeName,
Boolean isBindingParameterCollection);
protected abstract EdmFunction createBoundFunction(FullQualifiedName functionName,
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java
index 7a922e5..191e515 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java
@@ -48,5 +48,4 @@ public class EdmComplexTypeImpl extends EdmStructuralTypeImpl implements EdmComp
return baseType;
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImpl.java
index c85a253..aef3cc7 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImpl.java
@@ -30,7 +30,7 @@ public class EdmEntitySetInfoImpl implements EdmEntitySetInfo {
private final EntityContainer entityContainer;
private final EntitySet set;
- public EdmEntitySetInfoImpl(EntityContainer entityContainer, EntitySet set) {
+ public EdmEntitySetInfoImpl(final EntityContainer entityContainer, final EntitySet set) {
this.entityContainer = entityContainer;
this.set = set;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java
index 6f4c0c0..6024d04 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java
@@ -87,7 +87,7 @@ public class EdmEntityTypeImpl extends EdmStructuralTypeImpl implements EdmEntit
if (baseType != null) {
return entityBaseType.getKeyPropertyRefs();
} else {
- if(keyPropertyRefsList == null){
+ if (keyPropertyRefsList == null) {
keyPropertyRefsList = new ArrayList<EdmKeyPropertyRef>(keyPropertyRefs.values());
}
return keyPropertyRefsList;
@@ -115,5 +115,4 @@ public class EdmEntityTypeImpl extends EdmStructuralTypeImpl implements EdmEntit
return baseType;
}
-
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java
index fd137f6..96c3c9b 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java
@@ -59,7 +59,7 @@ public class EdmEnumImpl extends EdmNamedImpl implements EdmEnumType {
@Override
public boolean isCompatible(final EdmPrimitiveType primitiveType) {
- return this.equals(primitiveType);
+ return equals(primitiveType);
}
@Override
@@ -80,8 +80,9 @@ public class EdmEnumImpl extends EdmNamedImpl implements EdmEnumType {
}
@Override
- public <T> T valueOfString(String value, Boolean isNullable, Integer maxLength, Integer precision, Integer scale,
- Boolean isUnicode, Class<T> returnType) throws EdmPrimitiveTypeException {
+ public <T> T valueOfString(final String value, final Boolean isNullable, final Integer maxLength,
+ final Integer precision, final Integer scale,
+ final Boolean isUnicode, final Class<T> returnType) throws EdmPrimitiveTypeException {
if (value == null) {
if (isNullable != null && !isNullable) {
throw new EdmPrimitiveTypeException("EdmPrimitiveTypeException.LITERAL_NULL_NOT_ALLOWED");
@@ -92,8 +93,9 @@ public class EdmEnumImpl extends EdmNamedImpl implements EdmEnumType {
}
@Override
- public String valueToString(Object value, Boolean isNullable, Integer maxLength, Integer precision, Integer scale,
- Boolean isUnicode) throws EdmPrimitiveTypeException {
+ public String valueToString(final Object value, final Boolean isNullable, final Integer maxLength,
+ final Integer precision, final Integer scale,
+ final Boolean isUnicode) throws EdmPrimitiveTypeException {
if (value == null) {
if (isNullable != null && !isNullable) {
throw new EdmPrimitiveTypeException("EdmPrimitiveTypeException.VALUE_NULL_NOT_ALLOWED");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImpl.java
index 9655b09..52f5b4d 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImpl.java
@@ -30,7 +30,7 @@ public class EdmFunctionImportInfoImpl implements EdmFunctionImportInfo {
private EntityContainer entityContainer;
private FunctionImport functionImport;
- public EdmFunctionImportInfoImpl(EntityContainer entityContainer, FunctionImport functionImport) {
+ public EdmFunctionImportInfoImpl(final EntityContainer entityContainer, final FunctionImport functionImport) {
this.entityContainer = entityContainer;
this.functionImport = functionImport;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java
index 6db932d..2d07fd3 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java
@@ -221,7 +221,7 @@ public class EdmProviderImpl extends EdmImpl {
}
@Override
- protected EdmAction createUnboundAction(FullQualifiedName actionName) {
+ protected EdmAction createUnboundAction(final FullQualifiedName actionName) {
try {
List<Action> actions = actionsMap.get(actionName);
if (actions == null) {
@@ -247,7 +247,7 @@ public class EdmProviderImpl extends EdmImpl {
}
@Override
- protected EdmFunction createUnboundFunction(FullQualifiedName functionName, List<String> parameterNames) {
+ protected EdmFunction createUnboundFunction(final FullQualifiedName functionName, final List<String> parameterNames) {
try {
List<Function> functions = functionsMap.get(functionName);
if (functions == null) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonInfoImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonInfoImpl.java
index 512ddaf..2e7e373 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonInfoImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonInfoImpl.java
@@ -30,7 +30,7 @@ public class EdmSingletonInfoImpl implements EdmSingletonInfo {
private final EntityContainer entityContainer;
private final Singleton singleton;
- public EdmSingletonInfoImpl(EntityContainer entityContainer, Singleton singleton) {
+ public EdmSingletonInfoImpl(final EntityContainer entityContainer, final Singleton singleton) {
this.entityContainer = entityContainer;
this.singleton = singleton;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java
index 0961a2f..44c9be7 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java
@@ -109,7 +109,7 @@ public abstract class EdmStructuralTypeImpl extends EdmTypeImpl implements EdmSt
}
@Override
- public boolean compatibleTo(EdmType targetType) {
+ public boolean compatibleTo(final EdmType targetType) {
EdmStructuralType sourceType = this;
if (targetType == null) {
throw new EdmException("Target type must not be null");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java
index 58d81a1..680cec1 100644
--- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java
+++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java
@@ -40,7 +40,7 @@ public class EdmTypeDefinitionImpl extends EdmNamedImpl implements EdmTypeDefini
this.typeDefinition = typeDefinition;
// TODO: Should we check for edmNamespace in the underlying type name?
try {
- this.edmPrimitiveTypeInstance =
+ edmPrimitiveTypeInstance =
EdmPrimitiveTypeKind.valueOf(typeDefinition.getUnderlyingType().getName()).getEdmPrimitiveTypeInstance();
} catch (IllegalArgumentException e) {
throw new EdmException("Invalid underlying type: " + typeDefinitionName, e);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java
index a740db2..7df6493 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java
@@ -43,7 +43,8 @@ public class ActionMapKeyTest {
}
- private void createAndCheckForEdmException(FullQualifiedName fqn, FullQualifiedName typeName, Boolean collection) {
+ private void createAndCheckForEdmException(final FullQualifiedName fqn, final FullQualifiedName typeName,
+ final Boolean collection) {
try {
new ActionMapKey(fqn, typeName, collection);
} catch (EdmException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java
index 26dfc6e..d923d0a 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java
@@ -351,7 +351,7 @@ public class EdmImplCachingTest {
}
@Override
- protected EdmAction createUnboundAction(FullQualifiedName fqn) {
+ protected EdmAction createUnboundAction(final FullQualifiedName fqn) {
if (NAME1.equals(fqn)) {
EdmAction action = mock(EdmAction.class);
when(action.getNamespace()).thenReturn(fqn.getNamespace());
@@ -367,7 +367,7 @@ public class EdmImplCachingTest {
}
@Override
- protected EdmFunction createUnboundFunction(FullQualifiedName fqn, List<String> parameterNames) {
+ protected EdmFunction createUnboundFunction(final FullQualifiedName fqn, final List<String> parameterNames) {
if (NAME1.equals(fqn)) {
EdmFunction function = mock(EdmFunction.class);
when(function.getNamespace()).thenReturn(fqn.getNamespace());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java
index 46dd32e..b67389c 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java
@@ -110,12 +110,12 @@ public class EdmImplCallCreateTest {
assertNotNull(action);
assertEquals(FQN.getNamespace(), action.getNamespace());
assertEquals(FQN.getName(), action.getName());
-
+
EdmAction action2 = edm.getAction(FQN, FQN, true);
assertNotNull(action2);
assertEquals(FQN.getNamespace(), action2.getNamespace());
assertEquals(FQN.getName(), action2.getName());
-
+
assertNotSame(action, action2);
assertNull(edm.getAction(WRONG_FQN, null, null));
@@ -127,12 +127,12 @@ public class EdmImplCallCreateTest {
assertNotNull(function);
assertEquals(FQN.getNamespace(), function.getNamespace());
assertEquals(FQN.getName(), function.getName());
-
+
EdmFunction function2 = edm.getFunction(FQN, FQN, true, new ArrayList<String>());
assertNotNull(function2);
assertEquals(FQN.getNamespace(), function2.getNamespace());
assertEquals(FQN.getName(), function2.getName());
-
+
assertNotSame(function, function2);
assertNull(edm.getFunction(WRONG_FQN, null, null, null));
@@ -217,7 +217,8 @@ public class EdmImplCallCreateTest {
}
@Override
- public EdmFunction createBoundFunction(final FullQualifiedName fqn, final FullQualifiedName bindingParameterTypeName,
+ public EdmFunction createBoundFunction(final FullQualifiedName fqn,
+ final FullQualifiedName bindingParameterTypeName,
final Boolean isBindingParameterCollection, final List<String> bindingParameterNames) {
if (FQN.getNamespace().equals(fqn.getNamespace()) && FQN.getName().equals(fqn.getName())) {
EdmFunction function = mock(EdmFunction.class);
@@ -239,7 +240,7 @@ public class EdmImplCallCreateTest {
}
@Override
- protected EdmAction createUnboundAction(FullQualifiedName fqn) {
+ protected EdmAction createUnboundAction(final FullQualifiedName fqn) {
if (FQN.getNamespace().equals(fqn.getNamespace()) && FQN.getName().equals(fqn.getName())) {
EdmAction action = mock(EdmAction.class);
when(action.getNamespace()).thenReturn(fqn.getNamespace());
@@ -250,7 +251,7 @@ public class EdmImplCallCreateTest {
}
@Override
- protected EdmFunction createUnboundFunction(FullQualifiedName fqn, List<String> parameterNames) {
+ protected EdmFunction createUnboundFunction(final FullQualifiedName fqn, final List<String> parameterNames) {
if (FQN.getNamespace().equals(fqn.getNamespace()) && FQN.getName().equals(fqn.getName())) {
EdmFunction function = mock(EdmFunction.class);
when(function.getNamespace()).thenReturn(fqn.getNamespace());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImplTest.java
index 0b4a136..9e1da34 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImplTest.java
@@ -24,7 +24,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImplTest.java
index c273b21..ebf0b58 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImplTest.java
@@ -167,7 +167,8 @@ public class EdmEntityContainerImplTest {
private class CustomProvider extends EdmProvider {
@Override
- public EntitySet getEntitySet(FullQualifiedName entityContainer, String entitySetName) throws ODataException {
+ public EntitySet getEntitySet(final FullQualifiedName entityContainer, final String entitySetName)
+ throws ODataException {
if (entitySetName != null) {
return new EntitySet().setName("entitySetName");
}
@@ -175,7 +176,8 @@ public class EdmEntityContainerImplTest {
}
@Override
- public Singleton getSingleton(FullQualifiedName entityContainer, String singletonName) throws ODataException {
+ public Singleton getSingleton(final FullQualifiedName entityContainer, final String singletonName)
+ throws ODataException {
if (singletonName != null) {
return new Singleton().setName("singletonName");
}
@@ -183,7 +185,7 @@ public class EdmEntityContainerImplTest {
}
@Override
- public ActionImport getActionImport(FullQualifiedName entityContainer, String actionImportName)
+ public ActionImport getActionImport(final FullQualifiedName entityContainer, final String actionImportName)
throws ODataException {
if (actionImportName != null) {
return new ActionImport().setName("singletonName");
@@ -192,7 +194,7 @@ public class EdmEntityContainerImplTest {
}
@Override
- public FunctionImport getFunctionImport(FullQualifiedName entityContainer, String functionImportName)
+ public FunctionImport getFunctionImport(final FullQualifiedName entityContainer, final String functionImportName)
throws ODataException {
if (functionImportName != null) {
return new FunctionImport().setName("singletonName");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImplTest.java
index a8d3be3..c04d72d 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetInfoImplTest.java
@@ -47,5 +47,5 @@ public class EdmEntitySetInfoImplTest {
EdmEntitySetInfo info = new EdmEntitySetInfoImpl(providerContainer, providerEntitySet);
info.getEntitySetUri();
}
-
+
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java
index f5e5586..3a2b4d6 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java
@@ -114,9 +114,9 @@ public class EdmEntityTypeImplTest {
typeWithComplexKey = new EdmEntityTypeImpl(edm, typeWithComplexKeyName, typeWithComplexKeyProvider);
}
-
+
@Test
- public void hasStream(){
+ public void hasStream() {
assertFalse(typeWithBaseType.hasStream());
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumTest.java
index 3d08d4b..71bb26a 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumTest.java
@@ -165,7 +165,7 @@ public class EdmEnumTest extends PrimitiveTypeBaseTest {
assertEquals(Long.valueOf(1), instance.valueOfString("first", null, null, null, null, null, Long.class));
assertEquals(Byte.valueOf((byte) 65), instance.valueOfString("first,64", null, null, null, null, null, Byte.class));
assertEquals(Integer.valueOf(1), instance.valueOfString("1,1,first", null, null, null, null, null, Integer.class));
-
+
assertEquals(Integer.valueOf(1), nonFlagsInstance.valueOfString("1", null, null, null, null, null, Integer.class));
expectContentErrorInValueOfString(nonFlagsInstance, "1,64");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImplTest.java
index bec40d3..dd50231 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportInfoImplTest.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata4.commons.api.edm.provider.FunctionImport;
import org.junit.Test;
public class EdmFunctionImportInfoImplTest {
-
+
@Test
public void functionImportTest() {
FunctionImport providerFunctionImport = new FunctionImport().setName("name");
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImplTest.java
index 87b09bd..8ef61e2 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImplTest.java
@@ -58,7 +58,7 @@ public class EdmNavigationPropertyImplTest {
assertEquals("ns", type.getNamespace());
assertEquals("entity", type.getName());
- //Test caching
+ // Test caching
EdmType cachedType = property.getType();
assertTrue(type == cachedType);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java
index 6bd6ed3..d5bcdfe 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java
@@ -84,7 +84,7 @@ public class EdmProviderImplTest {
}
@Test
- public void convertExceptionsTest() throws Exception{
+ public void convertExceptionsTest() throws Exception {
EdmProvider localProvider = mock(EdmProvider.class);
FullQualifiedName fqn = new FullQualifiedName("namespace", "name");
when(localProvider.getEntityContainerInfo(fqn)).thenThrow(new ODataException("msg"));
@@ -94,7 +94,7 @@ public class EdmProviderImplTest {
when(localProvider.getComplexType(fqn)).thenThrow(new ODataException("msg"));
when(localProvider.getActions(fqn)).thenThrow(new ODataException("msg"));
when(localProvider.getFunctions(fqn)).thenThrow(new ODataException("msg"));
-
+
Edm localEdm = new EdmProviderImpl(localProvider);
callMethodAndExpectEdmException(localEdm, "getEntityContainer");
@@ -102,28 +102,28 @@ public class EdmProviderImplTest {
callMethodAndExpectEdmException(localEdm, "getTypeDefinition");
callMethodAndExpectEdmException(localEdm, "getEntityType");
callMethodAndExpectEdmException(localEdm, "getComplexType");
-
- //seperate because of signature
+
+ // seperate because of signature
try {
localEdm.getAction(fqn, null, null);
} catch (EdmException e) {
assertEquals("org.apache.olingo.odata4.commons.api.exception.ODataException: msg", e.getMessage());
}
-
+
try {
localEdm.getFunction(fqn, null, null, null);
} catch (EdmException e) {
assertEquals("org.apache.olingo.odata4.commons.api.exception.ODataException: msg", e.getMessage());
}
}
-
- private void callMethodAndExpectEdmException(Edm localEdm, String methodName) throws Exception {
+
+ private void callMethodAndExpectEdmException(final Edm localEdm, final String methodName) throws Exception {
Method method = localEdm.getClass().getMethod(methodName, FullQualifiedName.class);
try {
method.invoke(localEdm, new FullQualifiedName("namespace", "name"));
} catch (InvocationTargetException e) {
Throwable cause = e.getCause();
- if(cause instanceof EdmException){
+ if (cause instanceof EdmException) {
return;
}
}
@@ -131,10 +131,10 @@ public class EdmProviderImplTest {
}
@Test(expected = EdmException.class)
- public void convertExceptionsAliasTest() throws Exception{
+ public void convertExceptionsAliasTest() throws Exception {
EdmProvider localProvider = mock(EdmProvider.class);
when(localProvider.getAliasInfos()).thenThrow(new ODataException("msg"));
-
+
Edm localEdm = new EdmProviderImpl(localProvider);
localEdm.getEntityContainer(null);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImplTest.java
index 8cabaaf..ae54cec 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImplTest.java
@@ -22,7 +22,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
import org.apache.olingo.odata4.commons.api.edm.EdmComplexType;
import org.apache.olingo.odata4.commons.api.edm.EdmEntityType;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImplTest.java
index 17b70a0..62d3e0f 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImplTest.java
@@ -126,7 +126,7 @@ public class EdmServiceMetadataImplTest {
callGetFunctionImportInfosAndExpectException(serviceMetadata);
}
- private void callGetFunctionImportInfosAndExpectException(EdmServiceMetadata svc) {
+ private void callGetFunctionImportInfosAndExpectException(final EdmServiceMetadata svc) {
try {
svc.getFunctionImportInfos();
} catch (EdmException e) {
@@ -137,7 +137,7 @@ public class EdmServiceMetadataImplTest {
}
- private void callGetSingletonInfosAndExpectException(EdmServiceMetadata svc) {
+ private void callGetSingletonInfosAndExpectException(final EdmServiceMetadata svc) {
try {
svc.getSingletonInfos();
} catch (EdmException e) {
@@ -147,7 +147,7 @@ public class EdmServiceMetadataImplTest {
fail("Expected EdmException was not thrown");
}
- private void callGetEntitySetInfosAndExpectException(EdmServiceMetadata svc) {
+ private void callGetEntitySetInfosAndExpectException(final EdmServiceMetadata svc) {
try {
svc.getEntitySetInfos();
} catch (EdmException e) {
@@ -160,7 +160,7 @@ public class EdmServiceMetadataImplTest {
private class CustomProvider extends EdmProvider {
private List<Schema> schemas;
- public CustomProvider(boolean fillSchema) {
+ public CustomProvider(final boolean fillSchema) {
schemas = new ArrayList<Schema>();
if (fillSchema) {
List<EntitySet> entitySets = new ArrayList<EntitySet>();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImplTest.java
index 3d32387..fa65363 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImplTest.java
@@ -116,12 +116,12 @@ public class EdmSingletonImplTest {
final EdmSingleton singleton = new EdmSingletonImpl(edm, null, singletonProvider);
singleton.getRelatedBindingTarget("path");
}
-
+
@Test(expected = EdmException.class)
public void nonExsistingEntityType() throws Exception {
EdmProvider provider = mock(EdmProvider.class);
EdmProviderImpl edm = new EdmProviderImpl(provider);
-
+
Singleton singleton = new Singleton().setName("name");
final EdmSingleton edmSingleton = new EdmSingletonImpl(edm, null, singleton);
edmSingleton.getEntityType();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata4/blob/5d98f909/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImplTest.java
----------------------------------------------------------------------
diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImplTest.java
index 60a4d67..906b416 100644
--- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImplTest.java
+++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImplTest.java
@@ -1,6 +1,17 @@
package org.apache.olingo.odata4.commons.core.edm.provider;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+
+import org.apache.olingo.odata4.commons.api.edm.EdmException;
+import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition;
+import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind;
+import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
+import org.apache.olingo.odata4.commons.api.edm.provider.TypeDefinition;
+import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind;
+import org.junit.Test;
/*******************************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -19,17 +30,6 @@ import static org.junit.Assert.assertEquals;
* specific language governing permissions and limitations
* under the License.
******************************************************************************/
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
-
-import org.apache.olingo.odata4.commons.api.edm.EdmException;
-import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition;
-import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind;
-import org.apache.olingo.odata4.commons.api.edm.provider.FullQualifiedName;
-import org.apache.olingo.odata4.commons.api.edm.provider.TypeDefinition;
-import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind;
-import org.junit.Test;
public class EdmTypeDefinitionImplTest {