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/21 15:16:40 UTC
git commit: [OLINGO-71] cleanup before release candidate
Updated Branches:
refs/heads/master 8ede3bf74 -> b88fc592c
[OLINGO-71] cleanup before release candidate
Project: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/commit/b88fc592
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/b88fc592
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/b88fc592
Branch: refs/heads/master
Commit: b88fc592c41843c7a90671416aac296c1e4f6268
Parents: 8ede3bf
Author: Christian Amend <ch...@apache.org>
Authored: Tue Jan 21 15:13:50 2014 +0100
Committer: Christian Amend <ch...@apache.org>
Committed: Tue Jan 21 15:13:50 2014 +0100
----------------------------------------------------------------------
.../processor/api/AnnotationServiceFactory.java | 36 +++----
.../core/AnnotationServiceFactoryImpl.java | 4 +-
.../processor/core/ListsProcessor.java | 8 +-
.../core/datasource/AnnotationInMemoryDs.java | 12 +--
.../core/datasource/AnnotationValueAccess.java | 2 +-
.../processor/core/datasource/DataStore.java | 20 ++--
.../processor/core/util/AnnotationHelper.java | 10 +-
.../processor/core/util/ClassHelper.java | 7 +-
.../core/AnnotationServiceFactoryImplTest.java | 12 +--
.../processor/core/ListsProcessorTest.java | 8 +-
.../datasource/AnnotationValueAccessTest.java | 78 +++++++-------
.../datasource/AnnotationsInMemoryDsTest.java | 26 ++---
.../core/datasource/BeanPropertyAccessTest.java | 102 ++++++++++---------
.../processor/core/model/Building.java | 2 +-
.../annotation/processor/core/model/Room.java | 2 +-
.../core/util/AnnotationHelperTest.java | 32 +++---
.../processor/core/util/ClassHelperTest.java | 9 +-
.../ref/AnnotationRefServiceFactory.java | 6 +-
.../processor/ref/ServiceJsonTest.java | 4 +-
.../processor/ref/ServiceXmlTest.java | 2 +-
.../processor/core/access/data/JPAEntity.java | 14 +--
.../core/access/data/JPAEntityParser.java | 13 ++-
.../core/access/data/JPAExpandCallBack.java | 2 +-
.../jpa/processor/core/access/data/JPALink.java | 2 +-
.../processor/core/mock/data/EdmMockUtil.java | 2 +-
.../core/mock/data/ODataEntryMockUtil.java | 2 +-
.../jpa/processor/ref/model/SalesOrderItem.java | 2 +-
.../odata2/ref/processor/ListsProcessor.java | 12 +--
.../ref/processor/ScenarioDataSource.java | 2 +-
.../ref/processor/ListsProcessorTest.java | 6 +-
30 files changed, 223 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java b/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
index 38fe73a..aa03f38 100644
--- a/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
+++ b/odata2-annotation-processor/annotation-processor-api/src/main/java/org/apache/olingo/odata2/annotation/processor/api/AnnotationServiceFactory.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
*/
public abstract class AnnotationServiceFactory {
- private static final String IMPLEMENTATION =
+ private static final String IMPLEMENTATION =
"org.apache.olingo.odata2.annotation.processor.core.AnnotationServiceFactoryImpl";
/**
@@ -59,60 +59,62 @@ public abstract class AnnotationServiceFactory {
/**
* Interface to be implemented for an instance of a {@link AnnotationServiceFactoryInstance} which
- * provides an {@link ODataService} based on annotation from
+ * provides an {@link ODataService} based on annotation from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>).
*/
public interface AnnotationServiceFactoryInstance {
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage package name which is scanned for annotated classes
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
public ODataService createAnnotationService(String modelPackage) throws ODataException;
+
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage classes (which are annotated) which will be used for EDM definition and data access.
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
public ODataService createAnnotationService(Collection<Class<?>> annotatedClasses) throws ODataException;
}
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage package name which is scanned for annotated classes
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
- public static ODataService createAnnotationService(String modelPackage) throws ODataException {
+ public static ODataService createAnnotationService(final String modelPackage) throws ODataException {
return getInstance().createAnnotationService(modelPackage);
}
-
+
/**
- * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
+ * Create an {@link ODataService} which is based on an EDM and Processor which are using the annotations from
* <code>org.apache.olingo.olingo-odata2-api-annotation</code> module
* (see package <code>org.apache.olingo.odata2.api.annotation.edm</code>) to define the model and access the data.
*
* @param modelPackage classes (which are annotated) which will be used for EDM definition and data access.
- * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
- * for model definition and data access.
+ * @return service an {@link ODataService} based on on an EDM and Processor which are using annotations
+ * for model definition and data access.
* @throws ODataException if an error during initialization occurs
*/
- public static ODataService createAnnotationService(Collection<Class<?>> annotatedClasses) throws ODataException {
+ public static ODataService createAnnotationService(final Collection<Class<?>> annotatedClasses)
+ throws ODataException {
return getInstance().createAnnotationService(annotatedClasses);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
index 7947d6b..d8e0c7e 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImpl.java
@@ -37,7 +37,7 @@ public class AnnotationServiceFactoryImpl implements AnnotationServiceFactoryIns
* {@inheritDoc}
*/
@Override
- public ODataService createAnnotationService(String modelPackage) throws ODataException {
+ public ODataService createAnnotationService(final String modelPackage) throws ODataException {
AnnotationEdmProvider edmProvider = new AnnotationEdmProvider(modelPackage);
AnnotationInMemoryDs dataSource = new AnnotationInMemoryDs(modelPackage);
AnnotationValueAccess valueAccess = new AnnotationValueAccess();
@@ -51,7 +51,7 @@ public class AnnotationServiceFactoryImpl implements AnnotationServiceFactoryIns
* {@inheritDoc}
*/
@Override
- public ODataService createAnnotationService(Collection<Class<?>> annotatedClasses) throws ODataException {
+ public ODataService createAnnotationService(final Collection<Class<?>> annotatedClasses) throws ODataException {
AnnotationEdmProvider edmProvider = new AnnotationEdmProvider(annotatedClasses);
AnnotationInMemoryDs dataSource = new AnnotationInMemoryDs(annotatedClasses);
AnnotationValueAccess valueAccess = new AnnotationValueAccess();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/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 7e637f9..e65fd2b 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
@@ -205,11 +205,11 @@ public class ListsProcessor extends DataSourceProcessor {
return ODataResponse.fromResponse(response).build();
}
- String percentEncodeNextLink(String link) {
- if(link == null) {
+ String percentEncodeNextLink(final String link) {
+ if (link == null) {
return null;
}
-
+
return link.replaceAll("\\$skiptoken=.+?(?:&|$)", "")
.replaceAll("\\$skip=.+?(?:&|$)", "")
.replaceFirst("(?:\\?|&)$", ""); // Remove potentially trailing "?" or "&" left over from remove actions
@@ -906,7 +906,7 @@ public class ListsProcessor extends DataSourceProcessor {
keys.isEmpty() ?
dataSource.readData(startEntitySet) : dataSource.readData(startEntitySet, keys) :
dataSource.readData(functionImport, functionImportParameters, keys);
-
+
EdmEntitySet currentEntitySet =
functionImport == null ? startEntitySet : functionImport.getEntitySet();
for (NavigationSegment navigationSegment : navigationSegments) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
index 2096785..e83f5d1 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationInMemoryDs.java
@@ -50,7 +50,7 @@ public class AnnotationInMemoryDs implements DataSource {
this(annotatedClasses, true);
}
- public AnnotationInMemoryDs(final Collection<Class<?>> annotatedClasses, final boolean persistInMemory)
+ public AnnotationInMemoryDs(final Collection<Class<?>> annotatedClasses, final boolean persistInMemory)
throws ODataException {
this.persistInMemory = persistInMemory;
init(annotatedClasses);
@@ -77,12 +77,12 @@ public class AnnotationInMemoryDs implements DataSource {
try {
for (Class<?> clz : annotatedClasses) {
String entitySetName = ANNOTATION_HELPER.extractEntitySetName(clz);
- if(entitySetName != null) {
+ if (entitySetName != null) {
DataStore<Object> dhs = (DataStore<Object>) DataStore.createInMemory(clz, persistInMemory);
dataStores.put(entitySetName, dhs);
- } else if(!ANNOTATION_HELPER.isEdmAnnotated(clz)) {
- throw new ODataException("Found not annotated class during DataStore initilization of type: "
- + clz.getName());
+ } else if (!ANNOTATION_HELPER.isEdmAnnotated(clz)) {
+ throw new ODataException("Found not annotated class during DataStore initilization of type: "
+ + clz.getName());
}
}
} catch (DataStore.DataStoreException e) {
@@ -186,7 +186,7 @@ public class AnnotationInMemoryDs implements DataSource {
}
/**
- * Extract the <code>result data</code> from the <code>resultData</code> list based on
+ * Extract the <code>result data</code> from the <code>resultData</code> list based on
* <code>navigation information</code> and <code>targetKeys</code>.
*
* @param targetStore
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
index cc36d2a..9989e8f 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccess.java
@@ -71,7 +71,7 @@ public class AnnotationValueAccess implements ValueAccess {
*/
@Override
public <T> Class<?> getPropertyType(final T data, final EdmProperty property) throws ODataException {
- if(data == null) {
+ if (data == null) {
return null;
} else if (annotationHelper.isEdmAnnotated(data)) {
Class<?> fieldType = annotationHelper.getFieldTypeForProperty(data, property.getName());
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
index 57b3d8c..7be4abe 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/datasource/DataStore.java
@@ -138,7 +138,7 @@ public class DataStore<T> {
return dataStore.remove(keyElement);
}
}
-
+
/**
* Are the key values equal for both instances.
* If all compared key values are <code>null</code> this also means equal.
@@ -150,36 +150,34 @@ public class DataStore<T> {
public boolean isKeyEqual(final T first, final T second) {
KeyElement firstKeys = getKeys(first);
KeyElement secondKeys = getKeys(second);
-
+
return firstKeys.equals(secondKeys);
}
-
+
/**
* Are the key values equal for both instances.
* If all compared key values are <code>null</code> this also means equal.
* Before object (keys) are compared it is validated that both object instance are NOT null
* and that both are from the same class as this {@link DataStore} (see {@link #dataTypeClass}).
- * For the equal check on {@link #dataTypeClass} instances without validation see
- * {@link #isKeyEqual(Object, Object)}.
+ * For the equal check on {@link #dataTypeClass} instances without validation see {@link #isKeyEqual(Object, Object)}.
*
* @param first first instance to check for key equal
* @param second second instance to check for key equal
* @return <code>true</code> if object instance have equal keys set.
*/
@SuppressWarnings("unchecked")
- public boolean isKeyEqualChecked(Object first, Object second) throws DataStoreException {
- if(first == null || second == null) {
+ public boolean isKeyEqualChecked(final Object first, final Object second) throws DataStoreException {
+ if (first == null || second == null) {
throw new DataStoreException("Tried to compare null values which is not allowed.");
- } else if(first.getClass() != dataTypeClass) {
+ } else if (first.getClass() != dataTypeClass) {
throw new DataStoreException("First value is no instance from required class '" + dataTypeClass + "'.");
- } else if(second.getClass() != dataTypeClass) {
+ } else if (second.getClass() != dataTypeClass) {
throw new DataStoreException("Second value is no instance from required class '" + dataTypeClass + "'.");
}
-
+
return isKeyEqual((T) first, (T) second);
}
-
private class KeyElement {
private int cachedHashCode = 42;
private final List<Object> keyValues;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
index 54ffb49..acf1deb 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelper.java
@@ -63,7 +63,7 @@ public class AnnotationHelper {
Map<String, Object> firstKeyFields = getValueForAnnotatedFields(firstInstance, EdmKey.class);
Map<String, Object> secondKeyFields = getValueForAnnotatedFields(secondInstance, EdmKey.class);
- if(firstKeyFields.isEmpty() && secondKeyFields.isEmpty()) {
+ if (firstKeyFields.isEmpty() && secondKeyFields.isEmpty()) {
throw new ODataRuntimeException("Both object instances does not have EdmKey fields defined ["
+ "firstClass=" + firstInstance.getClass().getName()
+ " secondClass=" + secondInstance.getClass().getName() + "].");
@@ -87,7 +87,7 @@ public class AnnotationHelper {
private boolean keyValuesMatch(final Map<String, Object> firstKeyValues, final Map<String, Object> secondKeyValues) {
if (firstKeyValues.size() != secondKeyValues.size()) {
return false;
- } else if(firstKeyValues.isEmpty()) {
+ } else if (firstKeyValues.isEmpty()) {
throw new ODataRuntimeException("No keys given for key value matching.");
} else {
Set<Map.Entry<String, Object>> entries = firstKeyValues.entrySet();
@@ -519,9 +519,9 @@ public class AnnotationHelper {
return fieldName2Value;
}
- private String extractPropertyName(Field field) {
+ private String extractPropertyName(final Field field) {
final EdmProperty property = field.getAnnotation(EdmProperty.class);
- if(property == null || property.name().isEmpty()) {
+ if (property == null || property.name().isEmpty()) {
return getCanonicalName(field);
} else {
return property.name();
@@ -664,7 +664,7 @@ public class AnnotationHelper {
return type.getEdmSimpleTypeInstance().valueOfString(propertyValue,
EdmLiteralKind.DEFAULT, null, fieldClass);
} catch (EdmSimpleTypeException ex) {
- throw new ODataRuntimeException("Conversion failed for string property ["
+ throw new ODataRuntimeException("Conversion failed for string property ["
+ propertyValue + "] on field ["
+ field + "] with error: " + ex.getMessage(), ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
index 27f9cdb..66f7860 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelper.java
@@ -104,7 +104,7 @@ public class ClassHelper {
return annotatedClasses;
}
- private static boolean isJarFile(URL url) {
+ private static boolean isJarFile(final URL url) {
String filename = url.getFile();
int index = filename.indexOf(JAR_RESOURCE_SEPARATOR);
if (index > JAR_FILE_ENDING.length()) {
@@ -114,7 +114,8 @@ public class ClassHelper {
return false;
}
- private static Collection<String> getClassFqnFromDir(final FilenameFilter ff, File folder, String packageToScan) {
+ private static Collection<String> getClassFqnFromDir(final FilenameFilter ff, final File folder,
+ final String packageToScan) {
List<String> classFiles = new ArrayList<String>();
String[] classFilesForFolder = folder.list(ff);
for (String name : classFilesForFolder) {
@@ -130,7 +131,7 @@ public class ClassHelper {
return classFiles;
}
- private static Collection<String> getClassFqnFromJar(String filepath, String packageToScan) {
+ private static Collection<String> getClassFqnFromJar(final String filepath, final String packageToScan) {
JarFile jarFile = null;
final String jarFilePath;
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
index 4feaac7..ddac573 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/AnnotationServiceFactoryImplTest.java
@@ -40,10 +40,10 @@ public class AnnotationServiceFactoryImplTest {
public void createFromPackage() throws ODataException {
AnnotationServiceFactoryImpl factory = new AnnotationServiceFactoryImpl();
ODataService service = factory.createAnnotationService(Building.class.getPackage().getName());
-
+
Assert.assertNotNull(service);
}
-
+
@Test
public void createFromAnnotatedClasses() throws ODataException {
AnnotationServiceFactoryImpl factory = new AnnotationServiceFactoryImpl();
@@ -56,19 +56,19 @@ public class AnnotationServiceFactoryImplTest {
annotatedClasses.add(Room.class);
annotatedClasses.add(Team.class);
ODataService service = factory.createAnnotationService(annotatedClasses);
-
+
Assert.assertNotNull(service);
}
- @Test(expected=ODataException.class)
+ @Test(expected = ODataException.class)
public void createFromClasses() throws ODataException {
AnnotationServiceFactoryImpl factory = new AnnotationServiceFactoryImpl();
-
+
final Collection<Class<?>> notAnnotatedClasses = new ArrayList<Class<?>>();
notAnnotatedClasses.add(String.class);
notAnnotatedClasses.add(Long.class);
ODataService service = factory.createAnnotationService(notAnnotatedClasses);
-
+
Assert.assertNotNull(service);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
index 82b857c..89c83da 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/ListsProcessorTest.java
@@ -33,16 +33,16 @@ public class ListsProcessorTest {
private ListsProcessor listsProcessor;
private DataSource mockedDataSource = Mockito.mock(DataSource.class);
private ValueAccess mockedValueAccess = Mockito.mock(ValueAccess.class);
-
+
@Test
public void init() throws ODataException {
DataSource dataSource = new AnnotationInMemoryDs(Building.class.getPackage().getName());
ValueAccess valueAccess = new AnnotationValueAccess();
ListsProcessor lp = new ListsProcessor(dataSource, valueAccess);
-
+
Assert.assertNotNull(lp);
}
-
+
public ListsProcessorTest() {
listsProcessor = new ListsProcessor(mockedDataSource, mockedValueAccess);
}
@@ -82,7 +82,7 @@ public class ListsProcessorTest {
String url = "Rooms?$orderby=Seats%20desc&$skiptoken=213&$top=200";
String result = listsProcessor.percentEncodeNextLink(url);
Assert.assertEquals("Rooms?$orderby=Seats%20desc&$top=200", result);
-
+
String url2 = "Rooms?$orderby=Seats%20desc&$skiptoken=213";
String result2 = listsProcessor.percentEncodeNextLink(url2);
Assert.assertEquals("Rooms?$orderby=Seats%20desc", result2);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
index df7b3a4..25b2fe9 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationValueAccessTest.java
@@ -39,7 +39,7 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(data, property);
-
+
Assert.assertEquals(String.class, type);
}
@@ -49,20 +49,18 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(null, property);
-
+
Assert.assertNull(type);
}
-
- @Test(expected=ODataNotImplementedException.class)
+ @Test(expected = ODataNotImplementedException.class)
public void getPropertyTypeNotAnnotated() throws ODataException {
AnnotationValueAccess ava = new AnnotationValueAccess();
NotAnnotatedBean data = new NotAnnotatedBean();
- data.name = "A Name";
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(data, property);
-
+
Assert.assertEquals(String.class, type);
}
@@ -74,7 +72,7 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("A Name", value);
}
@@ -86,7 +84,7 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
@@ -97,15 +95,14 @@ public class AnnotationValueAccessTest {
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
- @Test(expected=ODataNotImplementedException.class)
+ @Test(expected = ODataNotImplementedException.class)
public void getPropertyValueNotAnnotated() throws ODataException {
AnnotationValueAccess ava = new AnnotationValueAccess();
NotAnnotatedBean data = new NotAnnotatedBean();
- data.name = "A Name";
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
@@ -118,20 +115,19 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
Object value = "Another Name";
ava.setPropertyValue(data, property, value);
-
+
Assert.assertEquals("Another Name", data.name);
}
- @Test(expected=ODataNotImplementedException.class)
+ @Test(expected = ODataNotImplementedException.class)
public void setPropertyValueNotAnnotated() throws ODataException {
AnnotationValueAccess ava = new AnnotationValueAccess();
NotAnnotatedBean data = new NotAnnotatedBean();
- data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
Object value = "Another Name";
ava.setPropertyValue(data, property, value);
}
@@ -142,9 +138,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
ava.setPropertyValue(data, property, null);
-
+
Assert.assertNull(null, data.name);
}
@@ -153,9 +149,9 @@ public class AnnotationValueAccessTest {
AnnotationValueAccess ava = new AnnotationValueAccess();
SimpleEntity data = null;
EdmProperty property = mockProperty("Name");
-
+
ava.setPropertyValue(data, property, null);
-
+
// no exception is thrown, all fine
}
@@ -165,9 +161,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("mapped property value", value);
}
@@ -178,9 +174,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "property";
EdmMapping mapping = null;
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@@ -190,9 +186,9 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = null;
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@@ -202,10 +198,10 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = "Changed mapped property value";
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("Changed mapped property value", data.myMappedProperty);
}
@@ -215,10 +211,10 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertNull(data.myMappedProperty);
}
@@ -228,20 +224,20 @@ public class AnnotationValueAccessTest {
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = null;
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("mapped property value", data.myMappedProperty);
}
-
- private EdmProperty mockProperty(String name) throws EdmException {
+
+ private EdmProperty mockProperty(final String name) throws EdmException {
EdmProperty property = Mockito.mock(EdmProperty.class);
Mockito.when(property.getName()).thenReturn(name);
return property;
}
- private EdmMapping mockMapping(String mimeTypeKey) throws EdmException {
+ private EdmMapping mockMapping(final String mimeTypeKey) throws EdmException {
EdmMapping mapping = Mockito.mock(EdmMapping.class);
Mockito.when(mapping.getMediaResourceMimeTypeKey()).thenReturn(mimeTypeKey);
return mapping;
@@ -249,11 +245,11 @@ public class AnnotationValueAccessTest {
@EdmEntityType
private class SimpleEntity {
- @org.apache.olingo.odata2.api.annotation.edm.EdmProperty String name;
- @org.apache.olingo.odata2.api.annotation.edm.EdmProperty String myMappedProperty;
- }
-
- private class NotAnnotatedBean {
- private String name;
+ @org.apache.olingo.odata2.api.annotation.edm.EdmProperty
+ String name;
+ @org.apache.olingo.odata2.api.annotation.edm.EdmProperty
+ String myMappedProperty;
}
+
+ private class NotAnnotatedBean {}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
index ddf4ce5..690570a 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/AnnotationsInMemoryDsTest.java
@@ -68,8 +68,8 @@ public class AnnotationsInMemoryDsTest {
ANNOTATED_ENTITY_SET_CLASSES.add(Manager.class);
ANNOTATED_ENTITY_SET_CLASSES.add(Photo.class);
ANNOTATED_ENTITY_SET_CLASSES.add(Room.class);
- ANNOTATED_ENTITY_SET_CLASSES.add(Team. class);
-
+ ANNOTATED_ENTITY_SET_CLASSES.add(Team.class);
+
ANNOTATED_MODEL_CLASSES.addAll(ANNOTATED_ENTITY_SET_CLASSES);
ANNOTATED_MODEL_CLASSES.add(Location.class);
ANNOTATED_MODEL_CLASSES.add(City.class);
@@ -84,7 +84,7 @@ public class AnnotationsInMemoryDsTest {
datasource = new AnnotationInMemoryDs(Building.class.getPackage().getName(), false);
edmProvider = new AnnotationEdmProvider(Building.class.getPackage().getName());
}
-
+
@Test
public void initFromPackage() throws Exception {
AnnotationInMemoryDs ds = new AnnotationInMemoryDs(Building.class.getPackage().getName(), false);
@@ -205,7 +205,7 @@ public class AnnotationsInMemoryDsTest {
}
private Thread createBuildingThread(final CountDownLatch latch, final DataSource datasource,
- final EdmEntitySet edmEntitySet, final String id) {
+ final EdmEntitySet edmEntitySet, final String id) {
Runnable run = new Runnable() {
@Override
public void run() {
@@ -447,7 +447,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- buildingsEntitySet, building, roomsEntitySet, Collections.EMPTY_MAP);
+ buildingsEntitySet, building, roomsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertTrue("Result is no collection.", relatedData instanceof Collection);
@@ -482,7 +482,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
+ roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertTrue("Result is no room.", relatedData instanceof Building);
@@ -512,7 +512,7 @@ public class AnnotationsInMemoryDsTest {
// execute
Object relatedData = datasource.readRelatedData(
- roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
+ roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
// validate
Assert.assertNull("Related data must be null.", relatedData);
@@ -549,7 +549,7 @@ public class AnnotationsInMemoryDsTest {
Map<String, Object> targetKeys = new HashMap<String, Object>();
targetKeys.put("Id", 3);
Object relatedData = datasource.readRelatedData(
- buildingsEntitySet, building, roomsEntitySet, targetKeys);
+ buildingsEntitySet, building, roomsEntitySet, targetKeys);
// validate
Assert.assertTrue("Result is no Room.", relatedData instanceof Room);
@@ -708,8 +708,7 @@ public class AnnotationsInMemoryDsTest {
try {
Building readAfterDelete = (Building) datasource.readData(edmEntitySet, keys);
Assert.fail("Expected " + ODataNotFoundException.class + "was not thrown for '" + readAfterDelete + "'.");
- } catch (ODataNotFoundException e) {
- }
+ } catch (ODataNotFoundException e) {}
}
@Test(expected = ODataRuntimeException.class)
@@ -757,7 +756,8 @@ public class AnnotationsInMemoryDsTest {
Building created = buildingStore.create(building);
Room room = new Room(42, "Room with Number");
- room.setSeats(123);;
+ room.setSeats(123);
+ ;
room.setVersion(4711);
roomStore.create(room);
@@ -785,8 +785,8 @@ public class AnnotationsInMemoryDsTest {
return createMockedEdmEntitySet(edmProvider, entitySetName);
}
- private EdmEntitySet createMockedEdmEntitySet(AnnotationEdmProvider edmProvider, final String entitySetName)
- throws ODataException {
+ private EdmEntitySet createMockedEdmEntitySet(final AnnotationEdmProvider edmProvider, final String entitySetName)
+ throws ODataException {
EntitySet entitySet = edmProvider.getEntitySet(DEFAULT_CONTAINER, entitySetName);
FullQualifiedName entityType = entitySet.getEntityType();
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
index 322116a..9d25e0a 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/datasource/BeanPropertyAccessTest.java
@@ -32,11 +32,11 @@ import org.mockito.Mockito;
public class BeanPropertyAccessTest {
private final BeanPropertyAccess ava;
-
+
public BeanPropertyAccessTest() {
ava = new BeanPropertyAccess();
}
-
+
@Test
public void getPropertyType() throws ODataException {
SimpleEntity data = new SimpleEntity();
@@ -44,11 +44,11 @@ public class BeanPropertyAccessTest {
EdmProperty property = mockProperty("Name");
Class<?> type = ava.getPropertyType(data, property);
-
+
Assert.assertEquals(String.class, type);
}
- @Test(expected=ODataNotFoundException.class)
+ @Test(expected = ODataNotFoundException.class)
public void getPropertyTypeInvalidPropertyName() throws ODataException {
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
@@ -60,200 +60,204 @@ public class BeanPropertyAccessTest {
@Test
public void getPropertyValue() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("A Name", value);
}
@Test
public void getPropertyValueBoolean() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
EdmProperty property = mockProperty("BooleanProperty", true);
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertEquals(Boolean.class, value.getClass());
Assert.assertEquals(true, value);
}
@Test
public void getPropertyValueNull() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
@Test
public void getPropertyValueNullData() throws ODataException {
-
+
SimpleEntity data = null;
EdmProperty property = mockProperty("Name");
Object value = ava.getPropertyValue(data, property);
-
+
Assert.assertNull(value);
}
@Test
public void setPropertyValue() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
Object value = "Another Name";
ava.setPropertyValue(data, property, value);
-
+
Assert.assertEquals("Another Name", data.name);
}
@Test
public void setPropertyValueNull() throws ODataException {
-
+
SimpleEntity data = new SimpleEntity();
data.name = "A Name";
EdmProperty property = mockProperty("Name");
-
+
ava.setPropertyValue(data, property, null);
-
+
Assert.assertNull(null, data.name);
}
@Test
public void getMappingValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertEquals(String.class, value.getClass());
Assert.assertEquals("mapped property value", value);
}
-
@Test
public void getMappingValueNullMapping() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "property";
EdmMapping mapping = null;
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@Test
public void getMappingValueNullValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = null;
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
@Test
public void setMappingValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = "Changed mapped property value";
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("Changed mapped property value", data.myMappedProperty);
}
@Test
public void setMappingValueNullValue() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = mockMapping("getMyMappedProperty");
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertNull(data.myMappedProperty);
}
@Test
public void setMappingValueNullMapping() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = "mapped property value";
EdmMapping mapping = null;
-
+
Object value = null;
ava.setMappingValue(data, mapping, value);
-
+
Assert.assertEquals("mapped property value", data.myMappedProperty);
}
- @Test(expected=ODataNotFoundException.class)
+ @Test(expected = ODataNotFoundException.class)
public void invalidMethodName() throws Exception {
-
+
SimpleEntity data = new SimpleEntity();
data.myMappedProperty = null;
EdmMapping mapping = mockMapping("MyMappedProperty");
-
+
Object value = ava.getMappingValue(data, mapping);
-
+
Assert.assertNull(value);
}
- private EdmProperty mockProperty(String name) throws EdmException {
+ private EdmProperty mockProperty(final String name) throws EdmException {
return mockProperty(name, false);
}
-
- private EdmProperty mockProperty(String name, boolean isBoolean) throws EdmException {
+
+ private EdmProperty mockProperty(final String name, final boolean isBoolean) throws EdmException {
EdmProperty property = Mockito.mock(EdmProperty.class);
Mockito.when(property.getName()).thenReturn(name);
Mockito.when(property.isSimple()).thenReturn(Boolean.TRUE);
- if(isBoolean) {
+ if (isBoolean) {
Mockito.when(property.getType()).thenReturn(EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance());
}
return property;
}
- private EdmMapping mockMapping(String mimeTypeKey) throws EdmException {
+ private EdmMapping mockMapping(final String mimeTypeKey) throws EdmException {
EdmMapping mapping = Mockito.mock(EdmMapping.class);
Mockito.when(mapping.getMimeType()).thenReturn(mimeTypeKey);
return mapping;
}
- private class SimpleEntity {
+ protected class SimpleEntity {
private String name;
private String myMappedProperty;
+
public final String getName() {
return name;
}
- public final void setName(String name) {
+
+ public final void setName(final String name) {
this.name = name;
}
+
public final String getMyMappedProperty() {
return myMappedProperty;
}
- public final void setMyMappedProperty(String myMappedProperty) {
+
+ public final void setMyMappedProperty(final String myMappedProperty) {
this.myMappedProperty = myMappedProperty;
}
+
public final boolean isBooleanProperty() {
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
index bc9f54b..350ef16 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Building.java
@@ -53,7 +53,7 @@ public class Building {
return id;
}
- public void setId(String id) {
+ public void setId(final String id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
index 57e42db..c808cbd 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/model/Room.java
@@ -42,7 +42,7 @@ public class Room extends RefBase {
public Room() {
this(0, null);
}
-
+
public Room(final int id, final String name) {
super(id, name);
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
index 2e95f82..7bd35ad 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/AnnotationHelperTest.java
@@ -196,7 +196,7 @@ public class AnnotationHelperTest {
public void setValueForPropertyNullInstance() throws Exception {
annotationHelper.setValueForProperty(null, "", null);
}
-
+
@Test
public void extractEntitySetNameObject() {
Assert.assertNull(annotationHelper.extractEntitySetName(Object.class));
@@ -213,7 +213,7 @@ public class AnnotationHelperTest {
Assert.assertEquals("RefScenario", fqn.getNamespace());
Assert.assertEquals("c_Location", fqn.getName());
}
-
+
@Test
public void convert() throws Exception {
ConversionProperty cp = new ConversionProperty();
@@ -223,7 +223,7 @@ public class AnnotationHelperTest {
annotationHelper.setValueForProperty(cp, "FloatProp", "43");
annotationHelper.setValueForProperty(cp, "DoubleProp", "42.00");
annotationHelper.setValueForProperty(cp, "ByteProp", "1");
-
+
Assert.assertEquals("42", cp.stringProp);
Assert.assertEquals(Integer.valueOf(420), cp.integerProp);
Assert.assertEquals(Long.valueOf("4200"), cp.longProp);
@@ -242,7 +242,7 @@ public class AnnotationHelperTest {
public SimpleEntity() {}
- public SimpleEntity(Long id, String name) {
+ public SimpleEntity(final Long id, final String name) {
this.id = id;
this.name = name;
}
@@ -256,15 +256,19 @@ public class AnnotationHelperTest {
}
private class ConversionProperty {
- @EdmProperty(type=EdmType.STRING) String stringProp;
- @EdmProperty(type=EdmType.INT32) Integer integerProp;
- @EdmProperty(type=EdmType.INT64) Long longProp;
- @EdmProperty(type=EdmType.DECIMAL) Float floatProp;
- @EdmProperty(type=EdmType.DOUBLE) Double doubleProp;
- @EdmProperty(type=EdmType.BYTE) Byte byteProp;
- }
-
- private class NotAnnotatedBean {
- private String name;
+ @EdmProperty(type = EdmType.STRING)
+ String stringProp;
+ @EdmProperty(type = EdmType.INT32)
+ Integer integerProp;
+ @EdmProperty(type = EdmType.INT64)
+ Long longProp;
+ @EdmProperty(type = EdmType.DECIMAL)
+ Float floatProp;
+ @EdmProperty(type = EdmType.DOUBLE)
+ Double doubleProp;
+ @EdmProperty(type = EdmType.BYTE)
+ Byte byteProp;
}
+
+ private class NotAnnotatedBean {}
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
index 0e7c406..c3cd885 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/annotation/processor/core/util/ClassHelperTest.java
@@ -34,7 +34,7 @@ public class ClassHelperTest {
private final ClassValidator annotatedTestEntityInnerClasses = new ClassValidator() {
@Override
- public boolean isClassValid(Class<?> c) {
+ public boolean isClassValid(final Class<?> c) {
return c.isAnnotationPresent(EdmEntityType.class)
&& c.getName().contains(ClassHelperTest.class.getSimpleName());
}
@@ -42,7 +42,7 @@ public class ClassHelperTest {
private final ClassValidator annotatedEntityClasses = new ClassValidator() {
@Override
- public boolean isClassValid(Class<?> c) {
+ public boolean isClassValid(final Class<?> c) {
return c.isAnnotationPresent(EdmEntityType.class);
}
};
@@ -58,7 +58,7 @@ public class ClassHelperTest {
Assert.assertEquals(1, loadedClasses.size());
Assert.assertEquals(SimpleEntity.class.getName(), loadedClasses.get(0).getName());
}
-
+
@Test
public void loadSingleEntityFromJar() throws ODataException {
String packageToScan = AnnotatedEntity.class.getPackage().getName();
@@ -71,7 +71,6 @@ public class ClassHelperTest {
Assert.assertEquals(AnnotatedEntity.class.getName(), loadedClasses.get(0).getName());
}
-
//
// The below classes are 'unused' within the code but must be declared for loading via
// the 'ClassHelper'
@@ -88,7 +87,7 @@ public class ClassHelperTest {
public SimpleEntity() {}
- public SimpleEntity(Long id, String name) {
+ public SimpleEntity(final Long id, final String name) {
this.id = id;
this.name = name;
}
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
index ccaca81..5a3766f 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/main/java/org/apache/olingo/odata2/annotation/processor/ref/AnnotationRefServiceFactory.java
@@ -56,7 +56,7 @@ public class AnnotationRefServiceFactory extends ODataServiceFactory {
final static String MODEL_PACKAGE = "org.apache.olingo.odata2.annotation.processor.ref.model";
final static ODataService ANNOTATION_ODATA_SERVICE;
-
+
static {
try {
ANNOTATION_ODATA_SERVICE = AnnotationServiceFactory.createAnnotationService(MODEL_PACKAGE);
@@ -116,10 +116,10 @@ public class AnnotationRefServiceFactory extends ODataServiceFactory {
}
- private static <T> DataStore<T> getDataStore(Class<T> clz) throws DataStoreException {
+ private static <T> DataStore<T> getDataStore(final Class<T> clz) throws DataStoreException {
return DataStore.createInMemory(clz, true);
}
-
+
private static void initializeSampleData() throws ODataApplicationException {
DataStore<Team> teamDs = getDataStore(Team.class);
teamDs.create(createTeam("Team Alpha", true));
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
index 4813690..66d3ff2 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceJsonTest.java
@@ -53,11 +53,11 @@ public class ServiceJsonTest extends AbstractRefTest {
Assert.assertTrue(jsonDataResponseContains(body, "Teams"));
}
- private boolean jsonDataResponseContains(String content, String containingValue) {
+ private boolean jsonDataResponseContains(final String content, final String containingValue) {
return content.matches("\\{\"d\":\\{\"EntitySets\":\\[.*"
+ containingValue + ".*\"\\]\\}\\}");
}
-
+
@Test
public void serviceDocumentAcceptHeaderJson() throws Exception {
final HttpResponse response = callUri("", HttpHeaders.ACCEPT, HttpContentType.APPLICATION_JSON);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
index 4d49883..a864c6a 100644
--- a/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
+++ b/odata2-annotation-processor/annotation-processor-ref/src/test/java/org/apache/olingo/odata2/annotation/processor/ref/ServiceXmlTest.java
@@ -41,7 +41,7 @@ public class ServiceXmlTest extends AbstractRefXmlTest {
final HttpResponse response = callUri("/");
checkMediaType(response, HttpContentType.APPLICATION_ATOM_SVC_UTF8);
final String body = getBody(response);
-
+
assertXpathEvaluatesTo("Employees", "/app:service/app:workspace/app:collection[@href=\"Employees\"]", body);
assertXpathEvaluatesTo("Teams", "/app:service/app:workspace/app:collection[@href=\"Teams\"]", body);
assertXpathEvaluatesTo("Rooms", "/app:service/app:workspace/app:collection[@href=\"Rooms\"]", body);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
index 36848c8..c7852d2 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAEntity.java
@@ -73,12 +73,12 @@ public class JPAEntity {
this.accessModifiersWrite = accessModifiersWrite;
}
- public void setParentJPAEntity(JPAEntity jpaEntity) {
- this.parentJPAEntity = jpaEntity;
+ public void setParentJPAEntity(final JPAEntity jpaEntity) {
+ parentJPAEntity = jpaEntity;
}
public JPAEntity getParentJPAEntity() {
- return this.parentJPAEntity;
+ return parentJPAEntity;
}
public Object getJPAEntity() {
@@ -202,7 +202,7 @@ public class JPAEntity {
EdmNavigationProperty navProperty =
(EdmNavigationProperty) oDataEntityType.getProperty(navigationPropertyName);
if (relatedJPAEntityMap != null && relatedJPAEntityMap.containsKey(navigationPropertyName)) {
- JPALink.linkJPAEntities(relatedJPAEntityMap.get(navigationPropertyName), this.jpaEntity,
+ JPALink.linkJPAEntities(relatedJPAEntityMap.get(navigationPropertyName), jpaEntity,
navProperty);
} else if (parentJPAEntity != null
&&
@@ -210,7 +210,7 @@ public class JPAEntity {
oDataEntitySet.getRelatedEntitySet(navProperty).getName())) {
List<Object> targetJPAEntities = new ArrayList<Object>();
targetJPAEntities.add(parentJPAEntity.getJPAEntity());
- JPALink.linkJPAEntities(targetJPAEntities, this.jpaEntity, navProperty);
+ JPALink.linkJPAEntities(targetJPAEntities, jpaEntity, navProperty);
} else {
leftNavPrpNames.add(navigationPropertyName);
}
@@ -218,7 +218,7 @@ public class JPAEntity {
}
if (!leftNavPrpNames.isEmpty()) {
JPALink link = new JPALink(oDataJPAContext);
- link.setSourceJPAEntity(this.jpaEntity);
+ link.setSourceJPAEntity(jpaEntity);
link.create(oDataEntitySet, oDataEntry, leftNavPrpNames);
}
} catch (EdmException e) {
@@ -252,7 +252,7 @@ public class JPAEntity {
}
write(oDataEntryProperties, false);
JPALink link = new JPALink(oDataJPAContext);
- link.setSourceJPAEntity(this.jpaEntity);
+ link.setSourceJPAEntity(jpaEntity);
try {
link.create(oDataEntitySet, oDataEntry, oDataEntityType.getNavigationPropertyNames());
} catch (EdmException e) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/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 f0ff44f..7fd2e8f 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
@@ -67,7 +67,8 @@ public final class JPAEntityParser {
return jpaEmbeddableKeyMap.get(jpaEntityName);
}
- public List<Map<String, Object>> parse2EdmEntityList(Collection<Object> jpaEntityList, List<EdmProperty> properties)
+ public List<Map<String, Object>> parse2EdmEntityList(final Collection<Object> jpaEntityList,
+ final List<EdmProperty> properties)
throws ODataJPARuntimeException {
if (jpaEntityList == null) {
@@ -261,7 +262,8 @@ public final class JPAEntityParser {
return propertyValue;
}
- public Object getEmbeddablePropertyValue(final String methodName, Object jpaEntity) throws ODataJPARuntimeException {
+ public Object getEmbeddablePropertyValue(final String methodName, final Object jpaEntity)
+ throws ODataJPARuntimeException {
String[] nameParts = methodName.split("\\.");
Object propertyValue = jpaEntity;
@@ -391,8 +393,9 @@ public final class JPAEntityParser {
}
}
- private HashMap<String, Method> getAccessModifiers(List<EdmProperty> edmProperties, Class<?> jpaEntityType,
- String accessModifier) throws ODataJPARuntimeException {
+ private HashMap<String, Method> getAccessModifiers(final List<EdmProperty> edmProperties,
+ final Class<?> jpaEntityType,
+ final String accessModifier) throws ODataJPARuntimeException {
HashMap<String, Method> accessModifierMap = jpaEntityAccessMap.get(jpaEntityType.getName());
if (accessModifierMap == null) {
@@ -462,7 +465,7 @@ public final class JPAEntityParser {
return accessModifierMap;
}
- private List<EdmProperty> getEdmProperties(EdmStructuralType structuralType) throws ODataJPARuntimeException {
+ private List<EdmProperty> getEdmProperties(final EdmStructuralType structuralType) throws ODataJPARuntimeException {
List<EdmProperty> edmProperties = new ArrayList<EdmProperty>();
try {
for (String propertyName : structuralType.getPropertyNames()) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
index 4bfa743..1ea8914 100644
--- a/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
+++ b/odata2-jpa-processor/jpa-core/src/main/java/org/apache/olingo/odata2/jpa/processor/core/access/data/JPAExpandCallBack.java
@@ -99,7 +99,7 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
return result;
}
- private List<EdmProperty> getEdmProperties(EdmEntitySet entitySet, ExpandSelectTreeNode expandTreeNode)
+ private List<EdmProperty> getEdmProperties(final EdmEntitySet entitySet, final ExpandSelectTreeNode expandTreeNode)
throws ODataApplicationException {
try {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/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 437c057..6e85366 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
@@ -193,7 +193,7 @@ public class JPALink {
}
public void create(final EdmEntitySet entitySet, final ODataEntry oDataEntry,
- List<String> navigationPropertyNames)
+ final List<String> navigationPropertyNames)
throws ODataJPARuntimeException,
ODataJPAModelException {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
index 632a299..cda54df 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/EdmMockUtil.java
@@ -297,7 +297,7 @@ public class EdmMockUtil {
EdmProperty property = mockEdmPropertyOfTarget();
EasyMock.expect(entityType.getProperty("price")).andStubReturn(property);
EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
-
+
List<EdmProperty> keyProperties = new ArrayList<EdmProperty>();
keyProperties.add(property);
EasyMock.expect(entityType.getKeyProperties()).andStubReturn(keyProperties);
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
index 125f160..27ac4ea 100644
--- a/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
+++ b/odata2-jpa-processor/jpa-core/src/test/java/org/apache/olingo/odata2/jpa/processor/core/mock/data/ODataEntryMockUtil.java
@@ -130,7 +130,7 @@ public class ODataEntryMockUtil {
}
private static void
- enhanceMockODataEntry(final ODataEntry oDataEntry, boolean hasInline, List<String> associationURIs) {
+ enhanceMockODataEntry(final ODataEntry oDataEntry, final boolean hasInline, final List<String> associationURIs) {
EasyMock.expect(oDataEntry.containsInlineEntry()).andReturn(hasInline).anyTimes();
EntryMetadata entryMetadata = EasyMock.createMock(EntryMetadata.class);
if (hasInline) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
----------------------------------------------------------------------
diff --git a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
index a8671d1..412287b 100644
--- a/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
+++ b/odata2-jpa-processor/jpa-ref/src/main/java/org/apache/olingo/odata2/jpa/processor/ref/model/SalesOrderItem.java
@@ -64,7 +64,7 @@ public class SalesOrderItem {
}
public void setDelivered(final Boolean deliveryStatus) {
- this.delivered = deliveryStatus;
+ delivered = deliveryStatus;
}
@JoinColumn(name = "Material_Id", referencedColumnName = "MATERIAL_ID")
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
index 32f196f..38cdd8c 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
@@ -129,7 +129,7 @@ public class ListsProcessor extends ODataSingleProcessor {
public ListsProcessor(final ScenarioDataSource dataSource) {
this(dataSource, new BeanPropertyAccess());
}
-
+
public ListsProcessor(final ScenarioDataSource dataSource, final BeanPropertyAccess valueAccess) {
this.dataSource = dataSource;
this.valueAccess = valueAccess;
@@ -212,16 +212,16 @@ public class ListsProcessor extends ODataSingleProcessor {
return ODataResponse.fromResponse(response).build();
}
- String percentEncodeNextLink(String link) {
- if(link == null) {
+ String percentEncodeNextLink(final String link) {
+ if (link == null) {
return null;
}
-
+
return link.replaceAll("\\$skiptoken=.+?(?:&|$)", "")
.replaceAll("\\$skip=.+?(?:&|$)", "")
.replaceFirst("(?:\\?|&)$", ""); // Remove potentially trailing "?" or "&" left over from remove actions
}
-
+
@Override
public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriInfo, final String contentType)
throws ODataException {
@@ -913,7 +913,7 @@ public class ListsProcessor extends ODataSingleProcessor {
keys.isEmpty() ?
dataSource.readData(startEntitySet) : dataSource.readData(startEntitySet, keys) :
dataSource.readData(functionImport, functionImportParameters, keys);
-
+
EdmEntitySet currentEntitySet =
functionImport == null ? startEntitySet : functionImport.getEntitySet();
for (NavigationSegment navigationSegment : navigationSegments) {
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
index cb055ed..d2f55aa 100644
--- a/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
+++ b/odata2-lib/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
@@ -605,7 +605,7 @@ public class ScenarioDataSource {
throw new ODataNotImplementedException();
}
}
-
+
/**
* Container to store binary data (as byte array) and the associated MIME type.
*/
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/b88fc592/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java b/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
index bfca445..b695a55 100644
--- a/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
+++ b/odata2-lib/odata-ref/src/test/java/org/apache/olingo/odata2/ref/processor/ListsProcessorTest.java
@@ -26,9 +26,9 @@ import org.junit.Test;
*
*/
public class ListsProcessorTest {
-
+
private ListsProcessor listsProcessor;
-
+
public ListsProcessorTest() {
listsProcessor = new ListsProcessor(null);
}
@@ -68,7 +68,7 @@ public class ListsProcessorTest {
String url = "Rooms?$orderby=Seats%20desc&$skiptoken=213&$top=200";
String result = listsProcessor.percentEncodeNextLink(url);
Assert.assertEquals("Rooms?$orderby=Seats%20desc&$top=200", result);
-
+
String url2 = "Rooms?$orderby=Seats%20desc&$skiptoken=213";
String result2 = listsProcessor.percentEncodeNextLink(url2);
Assert.assertEquals("Rooms?$orderby=Seats%20desc", result2);