You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/02/10 16:08:09 UTC

[28/35] git commit: [olingo-117] cleanup, rat and checkstyle issues

[olingo-117] cleanup, rat and checkstyle issues


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/75e0e533
Tree: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/tree/75e0e533
Diff: http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/diff/75e0e533

Branch: refs/heads/master
Commit: 75e0e533a50830d6d36ce1dba71d476c147a2b42
Parents: cdad25d
Author: Stephan Klevenz <sk...@apache.org>
Authored: Thu Jan 23 17:18:53 2014 +0100
Committer: Stephan Klevenz <sk...@apache.org>
Committed: Thu Jan 23 17:21:32 2014 +0100

----------------------------------------------------------------------
 .../processor/api/AnnotationServiceFactory.java |  35 +--
 .../core/AnnotationServiceFactoryImpl.java      |   4 +-
 .../processor/core/ListsProcessor.java          |   8 +-
 .../core/datasource/AnnotationInMemoryDs.java   |   4 +-
 .../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   |  58 +++--
 .../processor/core/model/Building.java          |   2 +-
 .../annotation/processor/core/model/Room.java   |   2 +-
 .../core/util/AnnotationHelperTest.java         |  32 +--
 .../processor/core/util/ClassHelperTest.java    |  19 +-
 .../ref/AnnotationRefServiceFactory.java        |   6 +-
 .../processor/ref/ServiceJsonTest.java          |   4 +-
 .../processor/ref/ServiceXmlTest.java           |   2 +-
 .../processor/core/access/data/JPAEntity.java   |   2 +-
 .../core/access/data/JPAEntityParser.java       |   2 +-
 .../jpa/processor/ref/model/SalesOrderItem.java | 219 +++++++++----------
 .../olingo/odata2/api/ep/EntityProvider.java    |   5 +-
 .../api/ep/entry/DeletedEntryMetadata.java      |   2 +-
 .../odata2/api/ep/feed/ODataDeltaFeed.java      |   4 +-
 .../odata2/core/ep/AtomEntityProvider.java      |   4 +-
 .../odata2/core/ep/JsonEntityProvider.java      |   4 +-
 .../odata2/core/ep/ProviderFacadeImpl.java      |   7 +-
 .../core/ep/consumer/XmlFeedConsumer.java       |   3 +-
 .../core/ep/entry/DeletedEntryMetadataImpl.java |  24 +-
 .../odata2/core/ep/feed/ODataDeltaFeedImpl.java |   2 +-
 .../JsonDeletedEntryEntityProducer.java         |   5 +-
 .../ep/producer/JsonFeedEntityProducer.java     |   5 +-
 .../odata2/core/commons/XmlHelperTest.java      |   5 +-
 .../core/ep/consumer/XmlFeedConsumerTest.java   |   6 +-
 .../JsonFeedWithDeltaLinkProducerTest.java      |   6 +-
 .../fit/client/ClientDeltaResponseTest.java     |  25 ++-
 .../olingo/odata2/fit/client/util/Client.java   |  63 ++++--
 .../odata2/fit/client/util/HttpException.java   |  20 +-
 .../odata2/ref/processor/ListsProcessor.java    |  14 +-
 .../ref/processor/ScenarioDataSource.java       |   2 +-
 .../ref/processor/ListsProcessorTest.java       |   6 +-
 42 files changed, 407 insertions(+), 341 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/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..dc9ff12 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,61 @@ 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/75e0e533/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/75e0e533/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/75e0e533/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 db5b79b..90794cc 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);
@@ -181,7 +181,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/75e0e533/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/75e0e533/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/75e0e533/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/75e0e533/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/75e0e533/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/75e0e533/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/75e0e533/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/75e0e533/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 3213556..c0fe898 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
@@ -119,7 +119,7 @@ public class AnnotationsInMemoryDsTest {
             localDs.createData(edmEntitySet, se);
           } catch (Exception ex) {
             throw new RuntimeException(ex);
-          }finally{
+          } finally {
             latch.countDown();
           }
         }
@@ -160,7 +160,7 @@ public class AnnotationsInMemoryDsTest {
 
     return new Thread(run);
   }
-  
+
   @Test
   public void readBinaryData() throws Exception {
     EdmEntitySet entitySet = createMockedEdmEntitySet("Photos");
@@ -178,7 +178,7 @@ public class AnnotationsInMemoryDsTest {
     keys.put("Name", "SomePic");
     keys.put("ImageFormat", "PNG");
     Photo toReadPhoto = (Photo) datasource.readData(entitySet, keys);
-    
+
     // execute
     BinaryData readBinaryData = datasource.readBinaryData(entitySet, toReadPhoto);
 
@@ -200,7 +200,7 @@ public class AnnotationsInMemoryDsTest {
     photo.setImage(image);
     photo.setImageType("image/png");
     photoDataStore.create(photo);
-    
+
     Photo toReadPhoto = new Photo();
     toReadPhoto.setName("SomePic");
     toReadPhoto.setType("PNG");
@@ -208,13 +208,12 @@ public class AnnotationsInMemoryDsTest {
     toReadPhoto.setImageType(null);
 
     BinaryData readBinaryData = datasource.readBinaryData(entitySet, toReadPhoto);
-    
+
     Assert.assertEquals("binary", new String(readBinaryData.getData(), Charset.defaultCharset()));
     Assert.assertArrayEquals(image, readBinaryData.getData());
     Assert.assertEquals("image/png", readBinaryData.getMimeType());
   }
 
-  
   @Test
   public void writeBinaryData() throws Exception {
     EdmEntitySet entitySet = createMockedEdmEntitySet("Photos");
@@ -241,7 +240,7 @@ public class AnnotationsInMemoryDsTest {
     Assert.assertEquals("image/png", storedPhoto.getImageType());
   }
 
-  @Test(expected=ODataNotFoundException.class)
+  @Test(expected = ODataNotFoundException.class)
   public void writeBinaryDataNotFound() throws Exception {
     EdmEntitySet entitySet = createMockedEdmEntitySet("Photos");
 
@@ -255,12 +254,11 @@ public class AnnotationsInMemoryDsTest {
     datasource.writeBinaryData(entitySet, toWritePhoto, writeBinaryData);
   }
 
-  
   @Test
   public void newDataObject() throws Exception {
     EdmEntitySet roomsEntitySet = createMockedEdmEntitySet("Rooms");
     Room room = (Room) datasource.newDataObject(roomsEntitySet);
-    
+
     Assert.assertNotNull(room);
   }
 
@@ -294,7 +292,7 @@ public class AnnotationsInMemoryDsTest {
     Building readBuilding = (Building) relatedData;
     Assert.assertEquals("Common Building", readBuilding.getName());
     Assert.assertEquals("1", readBuilding.getId());
-    
+
     Collection<Room> relatedRooms = readBuilding.getRooms();
     Assert.assertEquals(roomsCount, relatedRooms.size());
     for (Room room : relatedRooms) {
@@ -304,7 +302,7 @@ public class AnnotationsInMemoryDsTest {
     }
   }
 
-  @Test(expected=ODataRuntimeException.class)
+  @Test(expected = ODataRuntimeException.class)
   public void readUnknownEntity() throws Exception {
     EdmEntitySet unknownEntitySet = Mockito.mock(EdmEntitySet.class);
     Mockito.when(unknownEntitySet.getName()).thenReturn("UnknownEntity");
@@ -315,7 +313,7 @@ public class AnnotationsInMemoryDsTest {
     datasource.readData(unknownEntitySet, keys);
   }
 
-  @Test(expected=ODataRuntimeException.class)
+  @Test(expected = ODataRuntimeException.class)
   public void readUnknownEntities() throws Exception {
     EdmEntitySet unknownEntitySet = Mockito.mock(EdmEntitySet.class);
     Mockito.when(unknownEntitySet.getName()).thenReturn("UnknownEntity");
@@ -354,7 +352,6 @@ public class AnnotationsInMemoryDsTest {
     }
   }
 
-  
   @Test
   @SuppressWarnings("unchecked")
   public void readRelatedEntities() throws Exception {
@@ -417,7 +414,7 @@ public class AnnotationsInMemoryDsTest {
     Room read = (Room) datasource.readData(roomsEntitySet, keys);
     Assert.assertEquals("Room 12", read.getName());
     Assert.assertEquals("12", read.getId());
-    
+
     // execute
     Object relatedData = datasource.readRelatedData(
         roomsEntitySet, room, buildingsEntitySet, Collections.EMPTY_MAP);
@@ -622,8 +619,7 @@ public class AnnotationsInMemoryDsTest {
     Assert.assertEquals("image/jpg", readUpdated.getImageType());
     Assert.assertEquals("https://localhost/image.jpg", readUpdated.getImageUri());
   }
-  
-  
+
   @Test
   public void deleteSimpleEntity() throws Exception {
     EdmEntitySet edmEntitySet = createMockedEdmEntitySet("Buildings");
@@ -642,15 +638,15 @@ public class AnnotationsInMemoryDsTest {
 
     //
     datasource.deleteData(edmEntitySet, keys);
-    
+
     // validate
     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)
+  @Test(expected = ODataRuntimeException.class)
   public void unknownEntitySetForEntity() throws Exception {
     String entitySetName = "Unknown";
     FullQualifiedName entityType = new FullQualifiedName(DEFAULT_CONTAINER, entitySetName);
@@ -660,14 +656,14 @@ public class AnnotationsInMemoryDsTest {
     EdmEntityType edmEntityType = Mockito.mock(EdmEntityType.class);
     Mockito.when(edmEntitySet.getEntityType()).thenReturn(edmEntityType);
     Mockito.when(edmEntityType.getName()).thenReturn(entityType.getName());
-      
+
     Map<String, Object> keys = new HashMap<String, Object>();
     keys.put("Id", "1");
     //
     datasource.readData(edmEntitySet, keys);
   }
 
-  @Test(expected=ODataRuntimeException.class)
+  @Test(expected = ODataRuntimeException.class)
   public void unknownEntitySetForEntities() throws Exception {
     String entitySetName = "Unknown";
     FullQualifiedName entityType = new FullQualifiedName(DEFAULT_CONTAINER, entitySetName);
@@ -677,12 +673,11 @@ public class AnnotationsInMemoryDsTest {
     EdmEntityType edmEntityType = Mockito.mock(EdmEntityType.class);
     Mockito.when(edmEntitySet.getEntityType()).thenReturn(edmEntityType);
     Mockito.when(edmEntityType.getName()).thenReturn(entityType.getName());
-      
+
     //
     datasource.readData(edmEntitySet);
   }
 
-
   @Test
   public void writeRelations() throws Exception {
     DataStore<Building> buildingStore = DataStore.createInMemory(Building.class, true);
@@ -696,35 +691,36 @@ 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);
-    
+
     Map<String, Object> targetEntityKeyValues = new HashMap<String, Object>();
     targetEntityKeyValues.put("Id", 42);
-    
+
     // execute
     datasource.writeRelation(buildingsEntitySet, building, roomsEntitySet, targetEntityKeyValues);
-    
+
     // validate
     Building readBuilding = buildingStore.read(created);
     Room readRoom = roomStore.read(new Room(42, ""));
-    
+
     List<Room> readRooms = readBuilding.getRooms();
     Assert.assertEquals(1, readRooms.size());
     Assert.assertEquals(readRoom, readRooms.get(0));
-    
+
     Assert.assertEquals("42", readRoom.getId());
     Assert.assertEquals(123, readRoom.getSeats());
     Assert.assertEquals(4711, readRoom.getVersion());
     Assert.assertEquals(readBuilding, readRoom.getBuilding());
   }
-  
+
   private EdmEntitySet createMockedEdmEntitySet(final String entitySetName) throws ODataException {
     return createMockedEdmEntitySet(edmProvider, entitySetName);
   }
 
-  private EdmEntitySet createMockedEdmEntitySet(AnnotationEdmProvider edmProvider, final String entitySetName)
+  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/75e0e533/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/75e0e533/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/75e0e533/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/75e0e533/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..393b651 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'
@@ -85,17 +84,5 @@ public class ClassHelperTest {
     Long id;
     @EdmProperty
     String name;
-
-    public SimpleEntity() {}
-
-    public SimpleEntity(Long id, String name) {
-      this.id = id;
-      this.name = name;
-    }
-  }
-
-  @SuppressWarnings("unused")
-  private class NotAnnotatedBean {
-    private String name;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/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/75e0e533/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/75e0e533/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/75e0e533/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 f6cf6c1..239e16c 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
@@ -53,7 +53,7 @@ public class JPAEntity {
   private ODataJPAContext oDataJPAContext;
   public HashMap<EdmNavigationProperty, EdmEntitySet> inlinedEntities = null;
 
-  public JPAEntity(final EdmEntityType oDataEntityType, final EdmEntitySet oDataEntitySet, 
+  public JPAEntity(final EdmEntityType oDataEntityType, final EdmEntitySet oDataEntitySet,
       final ODataJPAContext context) {
     this.oDataEntityType = oDataEntityType;
     this.oDataEntitySet = oDataEntitySet;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/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 45e517d..63f258d 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
@@ -314,7 +314,7 @@ public final class JPAEntityParser {
         } catch (SecurityException e1) {
           throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e1);
         }
-        if (acceserMethod != null){
+        if (acceserMethod != null) {
           accessModifierMap.put(
               propertyName,
               acceserMethod);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/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 9ee0f19..76d28e2 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
@@ -30,116 +30,115 @@ import javax.persistence.Transient;
 @Table(name = "T_SALESORDERITEM")
 public class SalesOrderItem {
 
-	public SalesOrderItem() {
-	}
+  public SalesOrderItem() {}
 
-	public SalesOrderItem(final int quantity, final double amount,
-			final double discount, final Material material) {
-		super();
-		this.quantity = quantity;
-		this.amount = amount;
-		this.discount = discount;
-		this.material = material;
-	}
-
-	@EmbeddedId
-	private SalesOrderItemKey salesOrderItemKey;
-
-	@Column(name = "Material_Id", nullable = false)
-	private long matId;
-
-	@Column
-	private int quantity;
-
-	@Column
-	private double amount;
-
-	@Column
-	private double discount;
-
-	@Transient
-	private double netAmount;
-	
-	@Column
-	private boolean delivered;
-
-	public Boolean isDelivered() {
-		return delivered;
-	}
-
-	public void setDelivered(final Boolean deliveryStatus) {
-		this.delivered = deliveryStatus;
-	}
-
-	@JoinColumn(name = "Material_Id", referencedColumnName = "MATERIAL_ID", insertable = false, updatable = false)
-	@ManyToOne
-	private Material material;
-
-	@JoinColumn(name = "Sales_Order_Id", referencedColumnName = "SO_ID", insertable = false, updatable = false)
-	@ManyToOne
-	private SalesOrderHeader salesOrderHeader;
-
-	public SalesOrderItemKey getSalesOrderItemKey() {
-		return salesOrderItemKey;
-	}
-
-	public void setSalesOrderItemKey(final SalesOrderItemKey salesOrderItemKey) {
-		this.salesOrderItemKey = salesOrderItemKey;
-	}
-
-	public long getMatId() {
-		return matId;
-	}
-
-	public void setMatId(final long matId) {
-		this.matId = matId;
-	}
-
-	public int getQuantity() {
-		return quantity;
-	}
-
-	public void setQuantity(final int quantity) {
-		this.quantity = quantity;
-	}
-
-	public double getAmount() {
-		return amount;
-	}
-
-	public void setAmount(final double amount) {
-		this.amount = amount;
-	}
-
-	public double getDiscount() {
-		return discount;
-	}
-
-	public void setDiscount(final double discount) {
-		this.discount = discount;
-	}
-
-	public double getNetAmount() {
-		return netAmount;
-	}
-
-	public void setNetAmount(final double netAmount) {
-		this.netAmount = netAmount;
-	}
-
-	public Material getMaterial() {
-		return material;
-	}
-
-	public void setMaterial(final Material material) {
-		this.material = material;
-	}
-
-	public SalesOrderHeader getSalesOrderHeader() {
-		return salesOrderHeader;
-	}
+  public SalesOrderItem(final int quantity, final double amount,
+      final double discount, final Material material) {
+    super();
+    this.quantity = quantity;
+    this.amount = amount;
+    this.discount = discount;
+    this.material = material;
+  }
 
-	public void setSalesOrderHeader(final SalesOrderHeader salesOrderHeader) {
-		this.salesOrderHeader = salesOrderHeader;
-	}
+  @EmbeddedId
+  private SalesOrderItemKey salesOrderItemKey;
+
+  @Column(name = "Material_Id", nullable = false)
+  private long matId;
+
+  @Column
+  private int quantity;
+
+  @Column
+  private double amount;
+
+  @Column
+  private double discount;
+
+  @Transient
+  private double netAmount;
+
+  @Column
+  private boolean delivered;
+
+  public Boolean isDelivered() {
+    return delivered;
+  }
+
+  public void setDelivered(final Boolean deliveryStatus) {
+    delivered = deliveryStatus;
+  }
+
+  @JoinColumn(name = "Material_Id", referencedColumnName = "MATERIAL_ID", insertable = false, updatable = false)
+  @ManyToOne
+  private Material material;
+
+  @JoinColumn(name = "Sales_Order_Id", referencedColumnName = "SO_ID", insertable = false, updatable = false)
+  @ManyToOne
+  private SalesOrderHeader salesOrderHeader;
+
+  public SalesOrderItemKey getSalesOrderItemKey() {
+    return salesOrderItemKey;
+  }
+
+  public void setSalesOrderItemKey(final SalesOrderItemKey salesOrderItemKey) {
+    this.salesOrderItemKey = salesOrderItemKey;
+  }
+
+  public long getMatId() {
+    return matId;
+  }
+
+  public void setMatId(final long matId) {
+    this.matId = matId;
+  }
+
+  public int getQuantity() {
+    return quantity;
+  }
+
+  public void setQuantity(final int quantity) {
+    this.quantity = quantity;
+  }
+
+  public double getAmount() {
+    return amount;
+  }
+
+  public void setAmount(final double amount) {
+    this.amount = amount;
+  }
+
+  public double getDiscount() {
+    return discount;
+  }
+
+  public void setDiscount(final double discount) {
+    this.discount = discount;
+  }
+
+  public double getNetAmount() {
+    return netAmount;
+  }
+
+  public void setNetAmount(final double netAmount) {
+    this.netAmount = netAmount;
+  }
+
+  public Material getMaterial() {
+    return material;
+  }
+
+  public void setMaterial(final Material material) {
+    this.material = material;
+  }
+
+  public SalesOrderHeader getSalesOrderHeader() {
+    return salesOrderHeader;
+  }
+
+  public void setSalesOrderHeader(final SalesOrderHeader salesOrderHeader) {
+    this.salesOrderHeader = salesOrderHeader;
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
index 447df31..4ce2dac 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
@@ -663,8 +663,9 @@ public final class EntityProvider {
    * @return an {@link ODataDeltaFeed} object
    * @throws EntityProviderException if reading of data (de-serialization) fails
    */
-  public static ODataDeltaFeed readDeltaFeed(String contentType, EdmEntitySet entitySet, InputStream content,
-      EntityProviderReadProperties properties) throws EntityProviderException {
+  public static ODataDeltaFeed readDeltaFeed(final String contentType, final EdmEntitySet entitySet,
+      final InputStream content,
+      final EntityProviderReadProperties properties) throws EntityProviderException {
     return createEntityProvider().readDeltaFeed(contentType, entitySet, content, properties);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/DeletedEntryMetadata.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/DeletedEntryMetadata.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/DeletedEntryMetadata.java
index be5601e..f1e46a5 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/DeletedEntryMetadata.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/entry/DeletedEntryMetadata.java
@@ -38,5 +38,5 @@ public interface DeletedEntryMetadata {
    * @return the when date
    */
   Date getWhen();
-  
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataDeltaFeed.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataDeltaFeed.java b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataDeltaFeed.java
index c068772..2211624 100644
--- a/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataDeltaFeed.java
+++ b/odata2-lib/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataDeltaFeed.java
@@ -27,10 +27,8 @@ public interface ODataDeltaFeed extends ODataFeed {
   /**
    * Delta responses can contain changed feed data and deleted entries metadata. A delta response it the result of
    * a delta link. If the feed is not a delta feed then the list of deleted entries is null.
-   * @return metadata of deleted entries in case of feed is result of a delta response or null 
+   * @return metadata of deleted entries in case of feed is result of a delta response or null
    */
   public List<DeletedEntryMetadata> getDeletedEntries();
 
-
-  
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
index c0e88d1..7024d02 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
@@ -363,8 +363,8 @@ public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
   }
 
   @Override
-  public ODataDeltaFeed readDeltaFeed(EdmEntitySet entitySet, InputStream content,
-      EntityProviderReadProperties properties) throws EntityProviderException {
+  public ODataDeltaFeed readDeltaFeed(final EdmEntitySet entitySet, final InputStream content,
+      final EntityProviderReadProperties properties) throws EntityProviderException {
     XmlEntityConsumer xec = new XmlEntityConsumer();
     return xec.readFeed(entitySet, content, properties);
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
index 8f11653..442e273 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
@@ -336,8 +336,8 @@ public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
   }
 
   @Override
-  public ODataDeltaFeed readDeltaFeed(EdmEntitySet entitySet, InputStream content,
-      EntityProviderReadProperties properties) throws EntityProviderException {
+  public ODataDeltaFeed readDeltaFeed(final EdmEntitySet entitySet, final InputStream content,
+      final EntityProviderReadProperties properties) throws EntityProviderException {
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
index f1f250e..128f730 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
@@ -161,11 +161,12 @@ public class ProviderFacadeImpl implements EntityProviderInterface {
   }
 
   @Override
-  public ODataDeltaFeed readDeltaFeed(String contentType, EdmEntitySet entitySet, InputStream content,
-      EntityProviderReadProperties properties)  throws EntityProviderException {
+  public ODataDeltaFeed readDeltaFeed(final String contentType, final EdmEntitySet entitySet,
+      final InputStream content,
+      final EntityProviderReadProperties properties) throws EntityProviderException {
     return create(contentType).readDeltaFeed(entitySet, content, properties);
   }
-  
+
   @Override
   public ODataEntry readEntry(final String contentType, final EdmEntitySet entitySet, final InputStream content,
       final EntityProviderReadProperties properties) throws EntityProviderException {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
index 4ad55b6..2ffec2e 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
@@ -157,7 +157,8 @@ public class XmlFeedConsumer {
     }
   }
 
-  private void readInlineCount(final XMLStreamReader reader, FeedMetadataImpl metadata) throws XMLStreamException,
+  private void readInlineCount(final XMLStreamReader reader, final FeedMetadataImpl metadata)
+      throws XMLStreamException,
       EntityProviderException {
     String inlineCountString = reader.getElementText();
     if (inlineCountString != null) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/DeletedEntryMetadataImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/DeletedEntryMetadataImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/DeletedEntryMetadataImpl.java
index 8fc2cce..2b90870 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/DeletedEntryMetadataImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/DeletedEntryMetadataImpl.java
@@ -1,3 +1,21 @@
+/*******************************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ******************************************************************************/
 package org.apache.olingo.odata2.core.ep.entry;
 
 import java.util.Date;
@@ -8,7 +26,7 @@ public class DeletedEntryMetadataImpl implements DeletedEntryMetadata {
 
   private String uri;
   private Date when;
-  
+
   @Override
   public String getUri() {
     return uri;
@@ -19,11 +37,11 @@ public class DeletedEntryMetadataImpl implements DeletedEntryMetadata {
     return when;
   }
 
-  public void setUri(String uri) {
+  public void setUri(final String uri) {
     this.uri = uri;
   }
 
-  public void setWhen(Date when) {
+  public void setWhen(final Date when) {
     this.when = when;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataDeltaFeedImpl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataDeltaFeedImpl.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataDeltaFeedImpl.java
index 1ffa765..253492d 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataDeltaFeedImpl.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/feed/ODataDeltaFeedImpl.java
@@ -36,7 +36,7 @@ public class ODataDeltaFeedImpl implements ODataDeltaFeed {
   }
 
   public ODataDeltaFeedImpl(final List<ODataEntry> entries, final FeedMetadata feedMetadata,
-      List<DeletedEntryMetadata> deletedEntries) {
+      final List<DeletedEntryMetadata> deletedEntries) {
     this.entries = entries;
     this.feedMetadata = feedMetadata;
     this.deletedEntries = deletedEntries;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
index 14baf52..598f710 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonDeletedEntryEntityProducer.java
@@ -33,11 +33,12 @@ public class JsonDeletedEntryEntityProducer {
 
   private EntityProviderWriteProperties properties;
 
-  public JsonDeletedEntryEntityProducer(EntityProviderWriteProperties properties) {
+  public JsonDeletedEntryEntityProducer(final EntityProviderWriteProperties properties) {
     this.properties = properties;
   }
 
-  public void append(Writer writer, EntityInfoAggregator entityInfo, List<Map<String, Object>> deletedEntries)
+  public void append(final Writer writer, final EntityInfoAggregator entityInfo,
+      final List<Map<String, Object>> deletedEntries)
       throws EntityProviderException {
     JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
     try {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
index 25af754..758de1c 100644
--- a/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
+++ b/odata2-lib/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
@@ -112,7 +112,7 @@ public class JsonFeedEntityProducer {
     }
   }
 
-  private void appendNextLink(JsonStreamWriter jsonStreamWriter) throws IOException {
+  private void appendNextLink(final JsonStreamWriter jsonStreamWriter) throws IOException {
     // Write "next" link.
     // To be compatible with other implementations out there, the link is
     // written directly after "__next" and not as "{"uri":"next link"}",
@@ -123,7 +123,8 @@ public class JsonFeedEntityProducer {
     }
   }
 
-  private void appendDeltaLink(TombstoneCallback callback, JsonStreamWriter jsonStreamWriter) throws IOException {
+  private void appendDeltaLink(final TombstoneCallback callback, final JsonStreamWriter jsonStreamWriter)
+      throws IOException {
     if (callback != null) {
       TombstoneCallbackResult callbackResult = callback.getTombstoneCallbackResult();
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
index 956eb1b..dc8fb77 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/XmlHelperTest.java
@@ -89,9 +89,11 @@ public class XmlHelperTest {
 
   @BeforeClass
   public static void beforeClass() {
+    // CHECKSTYLE:OFF
     System.setProperty("javax.xml.stream.XMLInputFactory", "com.ctc.wstx.stax.WstxInputFactory"); // NOSONAR
+    // CHECKSTYLE:ON
   }
-  
+
   @Test
   public void createReader() throws Exception {
     InputStream content = new ByteArrayInputStream(XML.getBytes("UTF-8"));
@@ -191,7 +193,6 @@ public class XmlHelperTest {
     }
   }
 
-
   @Test
   @Ignore("not way to disable in parser")
   public void xmlProcessingApiWithProtection() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
index acd9f2e..9301258 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumerTest.java
@@ -144,12 +144,12 @@ public class XmlFeedConsumerTest extends AbstractXmlConsumerTest {
     EntityProviderReadProperties consumerProperties = EntityProviderReadProperties.init().build();
 
     ODataDeltaFeed deltaFeed = xec.readFeed(entitySet, reqContent, consumerProperties);
-    
+
     assertNotNull(deltaFeed);
-    
+
     assertNotNull(deltaFeed.getDeletedEntries());
     assertNotNull(deltaFeed.getEntries());
-    
+
     assertEquals(1, deltaFeed.getEntries().size());
     assertEquals(1, deltaFeed.getDeletedEntries().size());
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/75e0e533/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
index 4dddc31..97063e6 100644
--- a/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
+++ b/odata2-lib/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedWithDeltaLinkProducerTest.java
@@ -119,7 +119,7 @@ public class JsonFeedWithDeltaLinkProducerTest extends BaseTest {
     final EdmEntitySet entitySet = MockFacade.getMockEdm().getDefaultEntityContainer().getEntitySet("Rooms");
 
     deletedRoomData.clear();
-    
+
     TombstoneCallback tombstoneCallback =
         new TombstoneCallbackImpl(deletedRoomData, null);
 
@@ -159,7 +159,7 @@ public class JsonFeedWithDeltaLinkProducerTest extends BaseTest {
             + "host:80/service/Rooms('5')\"}"));
   }
 
-  private String writeRoomData(final EdmEntitySet entitySet, TombstoneCallback tombstoneCallback)
+  private String writeRoomData(final EdmEntitySet entitySet, final TombstoneCallback tombstoneCallback)
       throws URISyntaxException, EntityProviderException, IOException {
     Map<String, ODataCallback> callbacks = new HashMap<String, ODataCallback>();
     callbacks.put(TombstoneCallback.CALLBACK_KEY_TOMBSTONE, tombstoneCallback);
@@ -181,7 +181,7 @@ public class JsonFeedWithDeltaLinkProducerTest extends BaseTest {
     return json;
   }
 
-  private void validate(String json) {
+  private void validate(final String json) {
     Object obj = gson.fromJson(json, Object.class);
     assertNotNull(obj);
   }