olingo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sklev...@apache.org
Subject [2/3] [OLINGO-71] code cleanup
Date Thu, 12 Dec 2013 08:07:48 GMT
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/core/annotation/util/ClassHelper.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/core/annotation/util/ClassHelper.java b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/core/annotation/util/ClassHelper.java
index 75585d1..896d392 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/core/annotation/util/ClassHelper.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/main/java/org/apache/olingo/odata2/core/annotation/util/ClassHelper.java
@@ -25,45 +25,47 @@ import java.lang.reflect.Field;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.List;
+
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
  *
  */
 public class ClassHelper {
-  
+
   private static final File[] EMPTY_FILE_ARRAY = new File[0];
-  
+
   private static final FilenameFilter CLASSFILE_FILTER = new FilenameFilter() {
     @Override
-    public boolean accept(File dir, String name) {
+    public boolean accept(final File dir, final String name) {
       return name.endsWith(CLASSFILE_ENDING);
     }
+
     public static final String CLASSFILE_ENDING = ".class";
   };
-  
+
   private static final FileFilter FOLDER_FILTER = new FileFilter() {
     @Override
-    public boolean accept(File pathname) {
+    public boolean accept(final File pathname) {
       return pathname.isDirectory();
     }
   };
-  
-  public static final List<Class<?>> loadClasses(String packageToScan, ClassValidator cv) {
+
+  public static final List<Class<?>> loadClasses(final String packageToScan, final ClassValidator cv) {
     return loadClasses(packageToScan, CLASSFILE_FILTER, cv);
   }
 
-  
-  public static final List<Class<?>> loadClasses(String packageToScan, FilenameFilter ff, ClassValidator cv) {
+  public static final List<Class<?>> loadClasses(final String packageToScan, final FilenameFilter ff,
+      final ClassValidator cv) {
     final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
     String folderToScan = packageToScan.replace(".", "/");
     URL url = classLoader.getResource(folderToScan);
-    if(url == null) {
+    if (url == null) {
       throw new IllegalArgumentException("No folder to scan found for package '" + packageToScan + "'.");
     }
     File folder = new File(url.getFile());
     File[] classFiles = folder.listFiles(ff);
-    if(classFiles == null) {
+    if (classFiles == null) {
       classFiles = EMPTY_FILE_ARRAY;
     }
 
@@ -77,11 +79,11 @@ public class ClassHelper {
           annotatedClasses.add(c);
         }
       } catch (ClassNotFoundException ex) {
-        throw new IllegalArgumentException("Exception during class loading of class '" + fqn + 
-                "' with message '" + ex.getMessage() + "'.");
+        throw new IllegalArgumentException("Exception during class loading of class '" + fqn +
+            "' with message '" + ex.getMessage() + "'.");
       }
     }
-    
+
     // recursive search
     File[] subfolders = listSubFolder(folder);
     for (File file : subfolders) {
@@ -89,11 +91,11 @@ public class ClassHelper {
       annotatedClasses.addAll(subFolderClazzes);
     }
     //
-    
+
     return annotatedClasses;
   }
-  
-  public static Object getFieldValue(Object instance, Field field) {
+
+  public static Object getFieldValue(final Object instance, final Field field) {
     try {
       boolean access = field.isAccessible();
       field.setAccessible(true);
@@ -107,7 +109,7 @@ public class ClassHelper {
     }
   }
 
-  public static void setFieldValue(Object instance, Field field, Object value) {
+  public static void setFieldValue(final Object instance, final Field field, final Object value) {
     try {
       boolean access = field.isAccessible();
       field.setAccessible(true);
@@ -120,15 +122,14 @@ public class ClassHelper {
     }
   }
 
-
-  private static File[] listSubFolder(File folder) {
+  private static File[] listSubFolder(final File folder) {
     File[] subfolders = folder.listFiles(FOLDER_FILTER);
-    if(subfolders == null) {
+    if (subfolders == null) {
       return EMPTY_FILE_ARRAY;
     }
     return subfolders;
   }
-  
+
   public interface ClassValidator {
     boolean isClassValid(Class<?> c);
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/data/AnnotationsInMemoryDsTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/data/AnnotationsInMemoryDsTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/data/AnnotationsInMemoryDsTest.java
index 097ca55..f257933 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/data/AnnotationsInMemoryDsTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/data/AnnotationsInMemoryDsTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2013 The Apache Software Foundation.
- *
+ * 
  * Licensed 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
- *
+ * 
+ * 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.
@@ -62,7 +62,6 @@ public class AnnotationsInMemoryDsTest {
     Assert.assertEquals("1", read.getId());
   }
 
-  
   @Test
   public void createSimpleEntityWithOwnKey() throws Exception {
     EdmEntitySet edmEntitySet = createMockedEdmEntitySet("Buildings");
@@ -107,9 +106,8 @@ public class AnnotationsInMemoryDsTest {
     Building read = (Building) datasource.readData(edmEntitySet, keys);
     Assert.assertEquals("Duplicate Building", read.getName());
     Assert.assertEquals("1", read.getId());
-}
+  }
 
-  
   @Test
   public void createEntityTwoKeys() throws Exception {
     EdmEntitySet edmEntitySet = createMockedEdmEntitySet("Photos");
@@ -133,8 +131,9 @@ public class AnnotationsInMemoryDsTest {
   }
 
   @Test
-  //  @Ignore("Rethink update method")
-  public void createAndUpdateEntityTwoKeys() throws Exception {
+  // @Ignore("Rethink update method")
+      public
+      void createAndUpdateEntityTwoKeys() throws Exception {
     EdmEntitySet edmEntitySet = createMockedEdmEntitySet("Photos");
 
     Photo photo = new Photo();
@@ -175,7 +174,7 @@ public class AnnotationsInMemoryDsTest {
     Assert.assertEquals("https://localhost/image.jpg", readUpdated.getImageUri());
   }
 
-  private EdmEntitySet createMockedEdmEntitySet(String entitySetName) throws ODataException {
+  private EdmEntitySet createMockedEdmEntitySet(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/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationEdmProviderTest.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationEdmProviderTest.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationEdmProviderTest.java
index 494a090..b6863c6 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationEdmProviderTest.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/edm/AnnotationEdmProviderTest.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2013 The Apache Software Foundation.
- *
+ * 
  * Licensed 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
- *
+ * 
+ * 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.
@@ -71,8 +71,8 @@ public class AnnotationEdmProviderTest {
   @EdmComplexType
   private static final class GeneratedNamesComplexTestClass {}
 
-  @EdmEntityType(namespace="MyTestNamespace")
-  @EdmEntitySet(container="MyTestContainer")
+  @EdmEntityType(namespace = "MyTestNamespace")
+  @EdmEntitySet(container = "MyTestContainer")
   private static final class DefinedNamesTestClass {}
 
   private final AnnotationEdmProvider aep;
@@ -95,12 +95,12 @@ public class AnnotationEdmProviderTest {
   @Test
   public void defaultNamespaceGeneration() throws ODataException {
     Collection<Class<?>> localAnnotatedClasses = new ArrayList<Class<?>>();
-    localAnnotatedClasses.add(GeneratedNamesTestClass.class); 
+    localAnnotatedClasses.add(GeneratedNamesTestClass.class);
     AnnotationEdmProvider localAep = new AnnotationEdmProvider(localAnnotatedClasses);
-    // validate 
+    // validate
     EntityType testType = localAep.getEntityType(new FullQualifiedName(
-            GeneratedNamesTestClass.class.getPackage().getName(), 
-            GeneratedNamesTestClass.class.getSimpleName()));
+        GeneratedNamesTestClass.class.getPackage().getName(),
+        GeneratedNamesTestClass.class.getSimpleName()));
     assertNotNull("Requested entity not found.", testType);
     assertEquals("GeneratedNamesTestClass", testType.getName());
     assertNull("This should not have a base type", testType.getBaseType());
@@ -109,12 +109,12 @@ public class AnnotationEdmProviderTest {
   @Test
   public void defaultNamespaceGenerationComplexType() throws ODataException {
     Collection<Class<?>> localAnnotatedClasses = new ArrayList<Class<?>>();
-    localAnnotatedClasses.add(GeneratedNamesComplexTestClass.class); 
+    localAnnotatedClasses.add(GeneratedNamesComplexTestClass.class);
     AnnotationEdmProvider localAep = new AnnotationEdmProvider(localAnnotatedClasses);
-    // validate 
+    // validate
     ComplexType testType = localAep.getComplexType(new FullQualifiedName(
-            GeneratedNamesComplexTestClass.class.getPackage().getName(), 
-            GeneratedNamesComplexTestClass.class.getSimpleName()));
+        GeneratedNamesComplexTestClass.class.getPackage().getName(),
+        GeneratedNamesComplexTestClass.class.getSimpleName()));
     assertNotNull("Requested entity not found.", testType);
     assertEquals("GeneratedNamesComplexTestClass", testType.getName());
     assertNull("This should not have a base type", testType.getBaseType());
@@ -123,21 +123,20 @@ public class AnnotationEdmProviderTest {
   @Test
   public void defaultContainerNameGeneration() throws ODataException {
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    AnnotationEdmProvider localAep = 
-      new AnnotationEdmProvider((Collection) Arrays.asList(GeneratedNamesTestClass.class));
-    
+    AnnotationEdmProvider localAep =
+        new AnnotationEdmProvider((Collection) Arrays.asList(GeneratedNamesTestClass.class));
+
     EntityContainerInfo containerInfo = localAep.getEntityContainerInfo(null);
     assertNotNull(containerInfo);
     assertEquals("DefaultContainer", containerInfo.getName());
   }
 
-
   @Test
   public void defaultNamespaceDefined() throws ODataException {
     Collection<Class<?>> localAnnotatedClasses = new ArrayList<Class<?>>();
-    localAnnotatedClasses.add(DefinedNamesTestClass.class); 
+    localAnnotatedClasses.add(DefinedNamesTestClass.class);
     AnnotationEdmProvider localAep = new AnnotationEdmProvider(localAnnotatedClasses);
-    // validate 
+    // validate
     EntityType testClass = localAep.getEntityType(new FullQualifiedName("MyTestNamespace",
         DefinedNamesTestClass.class.getSimpleName()));
     assertNotNull("Requested entity not found.", testClass);
@@ -149,7 +148,7 @@ public class AnnotationEdmProviderTest {
   public void defaultContainerNameDefined() throws ODataException {
     @SuppressWarnings({ "unchecked", "rawtypes" })
     AnnotationEdmProvider localAep = new AnnotationEdmProvider((Collection) Arrays.asList(DefinedNamesTestClass.class));
-    
+
     EntityContainerInfo containerInfo = localAep.getEntityContainerInfo(null);
     assertNotNull(containerInfo);
     assertEquals("MyTestContainer", containerInfo.getName());
@@ -182,21 +181,21 @@ public class AnnotationEdmProviderTest {
     assertEquals(1, schemas.size());
     EntityContainerInfo info = aep.getEntityContainerInfo(ModelSharedConstants.CONTAINER_1);
     assertTrue(info.isDefaultEntityContainer());
-    
+
     FunctionImport funImp = aep.getFunctionImport(ModelSharedConstants.CONTAINER_1, "NoImport");
     assertNull(funImp);
 
     final FullQualifiedName associationFqn = new FullQualifiedName(
-            ModelSharedConstants.NAMESPACE_1, "NoAssociation");
+        ModelSharedConstants.NAMESPACE_1, "NoAssociation");
     Association noAssociation = aep.getAssociation(associationFqn);
     assertNull(noAssociation);
-    
+
     AssociationSet noAssociationSet = aep.getAssociationSet(
-            ModelSharedConstants.CONTAINER_1, associationFqn, "NoSrc", "NoSrcEntity");
+        ModelSharedConstants.CONTAINER_1, associationFqn, "NoSrc", "NoSrcEntity");
     assertNull(noAssociationSet);
-    
+
     AssociationSet asBuildingRooms = aep.getAssociationSet(
-            ModelSharedConstants.CONTAINER_1, defaultFqn("BuildingRooms"), "Buildings", "r_Building");
+        ModelSharedConstants.CONTAINER_1, defaultFqn("BuildingRooms"), "Buildings", "r_Building");
     assertNotNull(asBuildingRooms);
     assertEquals("Buildings", asBuildingRooms.getEnd1().getEntitySet());
     assertEquals("r_Building", asBuildingRooms.getEnd1().getRole());
@@ -229,7 +228,7 @@ public class AnnotationEdmProviderTest {
     assertEquals(ModelSharedConstants.CONTAINER_1, container.getName());
     final List<EntitySet> entitySets = container.getEntitySets();
     assertEquals(6, entitySets.size());
-    
+
     List<Association> associations = schema.getAssociations();
     assertEquals(4, associations.size());
     for (Association association : associations) {
@@ -237,59 +236,58 @@ public class AnnotationEdmProviderTest {
       validateAssociation(association);
     }
   }
-  
-  private FullQualifiedName defaultFqn(String name) {
+
+  private FullQualifiedName defaultFqn(final String name) {
     return new FullQualifiedName(ModelSharedConstants.NAMESPACE_1, name);
   }
 
-  private void validateAssociation(Association association) {
+  private void validateAssociation(final Association association) {
     String name = association.getName();
-    if(name.equals("r_Employee-r_Room")) {
-      validateAssociation(association, 
-              "r_Room", EdmMultiplicity.ONE, defaultFqn("Room"),
-              "r_Employee", EdmMultiplicity.MANY, defaultFqn("Employee"));
-    } else if(name.equals("BuildingRooms")) {
-        validateAssociation(association, 
-                "r_Building", EdmMultiplicity.ONE, defaultFqn("Building"),
-                "r_Room", EdmMultiplicity.MANY, defaultFqn("Room"));
-    } else if(name.equals("ManagerEmployees")) {
-        validateAssociation(association, 
-                "r_Manager", EdmMultiplicity.ONE, defaultFqn("Manager"),
-                "r_Employee", EdmMultiplicity.MANY, defaultFqn("Employee"));
-    } else if(name.equals("TeamEmployees")) {
-        validateAssociation(association, 
-                "r_Team", EdmMultiplicity.ONE, defaultFqn("Team"),
-                "r_Employee", EdmMultiplicity.MANY, defaultFqn("Employee"));
+    if (name.equals("r_Employee-r_Room")) {
+      validateAssociation(association,
+          "r_Room", EdmMultiplicity.ONE, defaultFqn("Room"),
+          "r_Employee", EdmMultiplicity.MANY, defaultFqn("Employee"));
+    } else if (name.equals("BuildingRooms")) {
+      validateAssociation(association,
+          "r_Building", EdmMultiplicity.ONE, defaultFqn("Building"),
+          "r_Room", EdmMultiplicity.MANY, defaultFqn("Room"));
+    } else if (name.equals("ManagerEmployees")) {
+      validateAssociation(association,
+          "r_Manager", EdmMultiplicity.ONE, defaultFqn("Manager"),
+          "r_Employee", EdmMultiplicity.MANY, defaultFqn("Employee"));
+    } else if (name.equals("TeamEmployees")) {
+      validateAssociation(association,
+          "r_Team", EdmMultiplicity.ONE, defaultFqn("Team"),
+          "r_Employee", EdmMultiplicity.MANY, defaultFqn("Employee"));
     } else {
-        fail("Got unknown association to validate with name '" + name + "'.");
+      fail("Got unknown association to validate with name '" + name + "'.");
     }
   }
 
-  private void validateAssociation(Association association, 
-          String fromRole, EdmMultiplicity fromMulti, FullQualifiedName fromType, 
-          String toRole, EdmMultiplicity toMulti, FullQualifiedName toType) {
+  private void validateAssociation(final Association association,
+      final String fromRole, final EdmMultiplicity fromMulti, final FullQualifiedName fromType,
+      final String toRole, final EdmMultiplicity toMulti, final FullQualifiedName toType) {
 
-    AssociationEnd[] ends = new AssociationEnd[]{association.getEnd1(),association.getEnd2()};
+    AssociationEnd[] ends = new AssociationEnd[] { association.getEnd1(), association.getEnd2() };
     for (AssociationEnd associationEnd : ends) {
-      if(associationEnd.getRole().equals(fromRole)) {
+      if (associationEnd.getRole().equals(fromRole)) {
         validateAssociationEnd(associationEnd, fromRole, fromMulti, fromType);
-      } else if(associationEnd.getRole().equals(toRole)) {
+      } else if (associationEnd.getRole().equals(toRole)) {
         validateAssociationEnd(associationEnd, toRole, toMulti, toType);
       } else {
-        fail("Unexpected navigation end '" + associationEnd.getRole() 
-                + "' for association with name '" + association.getName() + "'.");
+        fail("Unexpected navigation end '" + associationEnd.getRole()
+            + "' for association with name '" + association.getName() + "'.");
       }
     }
   }
 
-    private void validateAssociationEnd(AssociationEnd associationEnd, 
-          String role, EdmMultiplicity multiplicity, FullQualifiedName type) {
+  private void validateAssociationEnd(final AssociationEnd associationEnd,
+      final String role, final EdmMultiplicity multiplicity, final FullQualifiedName type) {
     assertEquals(role, associationEnd.getRole());
     assertEquals(multiplicity, associationEnd.getMultiplicity());
     assertEquals(type, associationEnd.getType());
   }
 
-
   @Test
   public void entitySetTeams() throws Exception {
     // validate teams
@@ -320,7 +318,7 @@ public class AnnotationEdmProviderTest {
         fail("Got unexpected navigation property with name '" + navigationProperty.getName() + "'.");
       }
     }
-}
+  }
 
   @Test
   public void entityTypeTeam() throws Exception {
@@ -332,7 +330,7 @@ public class AnnotationEdmProviderTest {
 
     assertEquals(1, team.getProperties().size());
     assertEquals(1, team.getNavigationProperties().size());
-    NavigationProperty navigationProperty= team.getNavigationProperties().get(0);
+    NavigationProperty navigationProperty = team.getNavigationProperties().get(0);
     validateNavProperty(navigationProperty, "TeamEmployees", "r_Team", "r_Employee");
   }
 
@@ -358,7 +356,7 @@ public class AnnotationEdmProviderTest {
     assertEquals("Name", name.getName());
     PropertyRef imageFormat = getPropertyRef(keyReferences, "ImageFormat");
     assertEquals("ImageFormat", imageFormat.getName());
-    
+
 //    assertEquals(0, photo.getNavigationProperties().size());
     assertNull(photo.getNavigationProperties());
   }
@@ -397,7 +395,7 @@ public class AnnotationEdmProviderTest {
 
     // validate location complex type
     ComplexType locationType = aep.getComplexType(
-            new FullQualifiedName(ModelSharedConstants.NAMESPACE_1, "c_Location"));
+        new FullQualifiedName(ModelSharedConstants.NAMESPACE_1, "c_Location"));
     assertEquals("c_Location", locationType.getName());
     assertEquals(2, locationType.getProperties().size());
   }
@@ -411,21 +409,21 @@ public class AnnotationEdmProviderTest {
     assertEquals(2, room.getProperties().size());
     final List<NavigationProperty> navigationProperties = room.getNavigationProperties();
     assertEquals(2, navigationProperties.size());
-    
+
     for (NavigationProperty navigationProperty : navigationProperties) {
-      if(navigationProperty.getName().equals("nr_Employees")) {
+      if (navigationProperty.getName().equals("nr_Employees")) {
         validateNavProperty(navigationProperty, "r_Employee-r_Room", "r_Room", "r_Employee");
-      } else if(navigationProperty.getName().equals("nr_Building")) {
+      } else if (navigationProperty.getName().equals("nr_Building")) {
         validateNavProperty(navigationProperty, "BuildingRooms", "r_Room", "r_Building");
       } else {
         fail("Got unexpected navigation property with name '" + navigationProperty.getName() + "'.");
       }
     }
   }
-  
-  private void validateNavProperty(NavigationProperty navigationProperty, String name,
-          String relationship, String fromRole, String toRole) {
-    if(name != null) {
+
+  private void validateNavProperty(final NavigationProperty navigationProperty, final String name,
+      final String relationship, final String fromRole, final String toRole) {
+    if (name != null) {
       assertEquals(name, navigationProperty.getName());
     }
     FullQualifiedName fqn = new FullQualifiedName(ModelSharedConstants.NAMESPACE_1, relationship);
@@ -433,28 +431,28 @@ public class AnnotationEdmProviderTest {
     assertEquals("Wrong fromRole for navigation property.", fromRole, navigationProperty.getFromRole());
     assertEquals("Wrong toRole for navigation property.", toRole, navigationProperty.getToRole());
   }
-  
-  private void validateNavProperty(NavigationProperty navigationProperty, 
-          String relationship, String fromRole, String toRole) {
+
+  private void validateNavProperty(final NavigationProperty navigationProperty,
+      final String relationship, final String fromRole, final String toRole) {
     validateNavProperty(navigationProperty, null, relationship, fromRole, toRole);
   }
-  
-  private boolean containsProperty(List<Property> properties, String propertyName) {
+
+  private boolean containsProperty(final List<Property> properties, final String propertyName) {
     return getProperty(properties, propertyName) != null;
   }
 
-  private Property getProperty(List<Property> properties, String name) {
+  private Property getProperty(final List<Property> properties, final String name) {
     for (Property property : properties) {
-      if(name.equals(property.getName())) {
+      if (name.equals(property.getName())) {
         return property;
       }
     }
     return null;
   }
-  
-  private PropertyRef getPropertyRef(List<PropertyRef> properties, String name) {
+
+  private PropertyRef getPropertyRef(final List<PropertyRef> properties, final String name) {
     for (PropertyRef property : properties) {
-      if(name.equals(property.getName())) {
+      if (name.equals(property.getName())) {
         return property;
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Building.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Building.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Building.java
index 737b5e2..9ff7cf5 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Building.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Building.java
@@ -79,7 +79,7 @@ public class Building {
 
   @Override
   public int hashCode() {
-      return id == null ? 0 : id.hashCode();
+    return id == null ? 0 : id.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/City.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/City.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/City.java
index 7b866a3..a4b48fd 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/City.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/City.java
@@ -21,11 +21,10 @@ package org.apache.olingo.odata2.core.annotation.model;
 import org.apache.olingo.odata2.api.annotation.edm.EdmComplexType;
 import org.apache.olingo.odata2.api.annotation.edm.EdmProperty;
 
-
 /**
  *  
  */
-@EdmComplexType(name="c_City", namespace = ModelSharedConstants.NAMESPACE_1)
+@EdmComplexType(name = "c_City", namespace = ModelSharedConstants.NAMESPACE_1)
 public class City {
 
   @EdmProperty

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Location.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Location.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Location.java
index 7f3f082..288de70 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Location.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Location.java
@@ -21,7 +21,6 @@ package org.apache.olingo.odata2.core.annotation.model;
 import org.apache.olingo.odata2.api.annotation.edm.EdmComplexType;
 import org.apache.olingo.odata2.api.annotation.edm.EdmProperty;
 
-
 /**
  *  
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Photo.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Photo.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Photo.java
index 520216a..8c920e4 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Photo.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Photo.java
@@ -88,19 +88,19 @@ public class Photo {
   }
 
   public void setImageType(final String imageType) {
-    this.mimeType = imageType;
+    mimeType = imageType;
   }
 
   @Override
   public int hashCode() {
     int hash = 5;
-    hash = 83 * hash + (this.name != null ? this.name.hashCode() : 0);
-    hash = 83 * hash + (this.type != null ? this.type.hashCode() : 0);
+    hash = 83 * hash + (name != null ? name.hashCode() : 0);
+    hash = 83 * hash + (type != null ? type.hashCode() : 0);
     return hash;
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(final Object obj) {
     if (obj == null) {
       return false;
     }
@@ -108,15 +108,15 @@ public class Photo {
       return false;
     }
     final Photo other = (Photo) obj;
-    if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+    if ((name == null) ? (other.name != null) : !name.equals(other.name)) {
       return false;
     }
-    if ((this.type == null) ? (other.type != null) : !this.type.equals(other.type)) {
+    if ((type == null) ? (other.type != null) : !type.equals(other.type)) {
       return false;
     }
     return true;
   }
-  
+
   @Override
   public String toString() {
     return "{\"Name\":\"" + name + "\","

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/RefBase.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/RefBase.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/RefBase.java
index 6f3002f..8d39492 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/RefBase.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/RefBase.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2013 The Apache Software Foundation.
- *
+ * 
  * Licensed 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
- *
+ * 
+ * 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.
@@ -24,15 +24,15 @@ import org.apache.olingo.odata2.api.annotation.edm.EdmType;
 /**
  *
  */
-@EdmEntityType(name="Base", namespace=ModelSharedConstants.NAMESPACE_1)
+@EdmEntityType(name = "Base", namespace = ModelSharedConstants.NAMESPACE_1)
 public abstract class RefBase {
-  @EdmProperty(name="Name")
+  @EdmProperty(name = "Name")
   protected String name;
-  @EdmProperty(name="Id", type = EdmType.STRING)
+  @EdmProperty(name = "Id", type = EdmType.STRING)
   @EdmKey
   protected int id;
 
-  public RefBase(int id, String name) {
+  public RefBase(final int id, final String name) {
     this.name = name;
     this.id = id;
   }
@@ -45,11 +45,11 @@ public abstract class RefBase {
     return Integer.toString(id);
   }
 
-  public void setName(String name) {
+  public void setName(final String name) {
     this.name = name;
   }
 
-  public void setId(int id) {
+  public void setId(final int id) {
     this.id = id;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/ResourceHelper.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/ResourceHelper.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/ResourceHelper.java
index 73d1218..7edfcfc 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/ResourceHelper.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/ResourceHelper.java
@@ -22,7 +22,7 @@ import java.awt.image.BufferedImage;
 import java.awt.image.WritableRaster;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
+
 import javax.imageio.ImageIO;
 
 /**
@@ -30,19 +30,21 @@ import javax.imageio.ImageIO;
  */
 public class ResourceHelper {
 
-  public enum Format {BMP, JPEG, PNG, GIF};
-  
+  public enum Format {
+    BMP, JPEG, PNG, GIF
+  };
+
   public static byte[] generateImage() {
     return generateImage(Format.PNG);
   }
-  
-  public static byte[] generateImage(Format format) {
+
+  public static byte[] generateImage(final Format format) {
     try {
       int width = 320;
       int height = 320;
       BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_BINARY);
       WritableRaster raster = image.getRaster();
-      
+
       int mod = format.ordinal() + 2;
       for (int h = 0; h < height; h++) {
         for (int w = 0; w < width; w++) {
@@ -53,7 +55,7 @@ public class ResourceHelper {
           }
         }
       }
-      
+
       ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
       ImageIO.write(image, format.name(), out);
       return out.toByteArray();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Room.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Room.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Room.java
index 7c9e486..98ddf3d 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Room.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Room.java
@@ -1,12 +1,12 @@
 /*
  * Copyright 2013 The Apache Software Foundation.
- *
+ * 
  * Licensed 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
- *
+ * 
+ * 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.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Team.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Team.java b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Team.java
index e9b296f..3f72319 100644
--- a/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Team.java
+++ b/odata2-annotation-processor/annotation-processor-core/src/test/java/org/apache/olingo/odata2/core/annotation/model/Team.java
@@ -55,8 +55,8 @@ public class Team extends RefBase {
     this.isScrumTeam = isScrumTeam;
   }
 
-  public void addEmployee(Employee e) {
-    this.employees.add(e);
+  public void addEmployee(final Employee e) {
+    employees.add(e);
   }
 
   public List<Employee> getEmployees() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Building.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Building.java b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Building.java
index 668ac86..5183195 100644
--- a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Building.java
+++ b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Building.java
@@ -71,7 +71,7 @@ public class Building {
     }
   }
 
-  public void addRoom(Room room) {
+  public void addRoom(final Room room) {
     rooms.add(room);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/City.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/City.java b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/City.java
index a4d5a56..8ec87b6 100644
--- a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/City.java
+++ b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/City.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.annotation.edm.EdmProperty;
 /**
  *  
  */
-@EdmComplexType(name="c_City", namespace = ModelSharedConstants.NAMESPACE_1)
+@EdmComplexType(name = "c_City", namespace = ModelSharedConstants.NAMESPACE_1)
 public class City {
 
   @EdmProperty

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Photo.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Photo.java b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Photo.java
index 52971cd..b098db5 100644
--- a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Photo.java
+++ b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Photo.java
@@ -88,19 +88,19 @@ public class Photo {
   }
 
   public void setImageType(final String imageType) {
-    this.mimeType = imageType;
+    mimeType = imageType;
   }
 
   @Override
   public int hashCode() {
     int hash = 5;
-    hash = 83 * hash + (this.name != null ? this.name.hashCode() : 0);
-    hash = 83 * hash + (this.type != null ? this.type.hashCode() : 0);
+    hash = 83 * hash + (name != null ? name.hashCode() : 0);
+    hash = 83 * hash + (type != null ? type.hashCode() : 0);
     return hash;
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(final Object obj) {
     if (obj == null) {
       return false;
     }
@@ -108,15 +108,15 @@ public class Photo {
       return false;
     }
     final Photo other = (Photo) obj;
-    if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+    if ((name == null) ? (other.name != null) : !name.equals(other.name)) {
       return false;
     }
-    if ((this.type == null) ? (other.type != null) : !this.type.equals(other.type)) {
+    if ((type == null) ? (other.type != null) : !type.equals(other.type)) {
       return false;
     }
     return true;
   }
-  
+
   @Override
   public String toString() {
     return "{\"Name\":\"" + name + "\","

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/RefBase.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/RefBase.java b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/RefBase.java
index 727b8c3..6424e0a 100644
--- a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/RefBase.java
+++ b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/RefBase.java
@@ -26,11 +26,11 @@ import org.apache.olingo.odata2.api.annotation.edm.EdmType;
 /**
  *
  */
-@EdmEntityType(name="Base", namespace=ModelSharedConstants.NAMESPACE_1)
+@EdmEntityType(name = "Base", namespace = ModelSharedConstants.NAMESPACE_1)
 public abstract class RefBase {
-  @EdmProperty(name="Name")
+  @EdmProperty(name = "Name")
   protected String name;
-  @EdmProperty(name="Id", type = EdmType.STRING)
+  @EdmProperty(name = "Id", type = EdmType.STRING)
   @EdmKey
   protected String id;
 
@@ -42,24 +42,24 @@ public abstract class RefBase {
     return id;
   }
 
-  public void setName(String name) {
+  public void setName(final String name) {
     this.name = name;
   }
 
-  public void setId(int id) {
+  public void setId(final int id) {
     this.id = String.valueOf(id);
   }
 
   @Override
   public int hashCode() {
-    if(id == null) {
+    if (id == null) {
       return -1;
     }
     return id.hashCode();
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(final Object obj) {
     if (obj == null) {
       return false;
     }
@@ -67,10 +67,10 @@ public abstract class RefBase {
       return false;
     }
     final RefBase other = (RefBase) obj;
-    if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
+    if ((name == null) ? (other.name != null) : !name.equals(other.name)) {
       return false;
     }
-    if ((this.id == null) ? (other.id != null) : !this.id.equals(other.id)) {
+    if ((id == null) ? (other.id != null) : !id.equals(other.id)) {
       return false;
     }
     return true;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/ResourceHelper.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/ResourceHelper.java b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/ResourceHelper.java
index 3d2bb88..80da2f3 100644
--- a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/ResourceHelper.java
+++ b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/ResourceHelper.java
@@ -23,6 +23,7 @@ import java.awt.image.WritableRaster;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+
 import javax.imageio.ImageIO;
 
 /**
@@ -30,11 +31,11 @@ import javax.imageio.ImageIO;
  */
 public class ResourceHelper {
 
-  public static byte[] loadAsByte(String resource) {
+  public static byte[] loadAsByte(final String resource) {
     return load(resource, new byte[0]);
   }
 
-  public static byte[] load(String resource, byte[] defaultResult) {
+  public static byte[] load(final String resource, final byte[] defaultResult) {
     InputStream instream = null;
     try {
       instream = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource);
@@ -51,27 +52,29 @@ public class ResourceHelper {
     } catch (IOException e) {
       throw new RuntimeException(e);
     } finally {
-      if(instream != null) {
+      if (instream != null) {
         try {
           instream.close();
-        } catch (IOException ex) { }
+        } catch (IOException ex) {}
       }
     }
   }
 
-  public enum Format {BMP, JPEG, PNG, GIF};
-  
+  public enum Format {
+    BMP, JPEG, PNG, GIF
+  };
+
   public static byte[] generateImage() {
     return generateImage(Format.PNG);
   }
-  
-  public static byte[] generateImage(Format format) {
+
+  public static byte[] generateImage(final Format format) {
     try {
       int width = 320;
       int height = 320;
       BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_BYTE_BINARY);
       WritableRaster raster = image.getRaster();
-      
+
       int mod = format.ordinal() + 2;
       for (int h = 0; h < height; h++) {
         for (int w = 0; w < width; w++) {
@@ -82,7 +85,7 @@ public class ResourceHelper {
           }
         }
       }
-      
+
       ByteArrayOutputStream out = new ByteArrayOutputStream(1024);
       ImageIO.write(image, format.name(), out);
       return out.toByteArray();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Team.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Team.java b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Team.java
index 50d2ad2..4767d29 100644
--- a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Team.java
+++ b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/model/Team.java
@@ -47,8 +47,8 @@ public class Team extends RefBase {
     this.isScrumTeam = isScrumTeam;
   }
 
-  public void addEmployee(Employee e) {
-    this.employees.add(e);
+  public void addEmployee(final Employee e) {
+    employees.add(e);
   }
 
   public List<Employee> getEmployees() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/processor/AnnotationServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/processor/AnnotationServiceFactory.java b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/processor/AnnotationServiceFactory.java
index 9360844..efc0635 100644
--- a/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/processor/AnnotationServiceFactory.java
+++ b/odata2-annotation-processor/annotation-processor-webref/src/main/java/org/apache/olingo/odata2/ref/annotation/processor/AnnotationServiceFactory.java
@@ -4,13 +4,13 @@
  * 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.ref.annotation.processor;
 
@@ -45,7 +45,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * ODataServiceFactory implemantion based on ListProcessor 
+ * ODataServiceFactory implemantion based on ListProcessor
  * in combination with Annotation-Support-Classes for EdmProvider, DataSource and ValueAccess.
  */
 public class AnnotationServiceFactory extends ODataServiceFactory {
@@ -79,20 +79,20 @@ public class AnnotationServiceFactory extends ODataServiceFactory {
   public ODataService createService(final ODataContext context) throws ODataException {
     // Edm via Annotations and ListProcessor via AnnotationDS with AnnotationsValueAccess
     return createODataSingleProcessorService(AnnotationInstances.EDM_PROVIDER,
-            new ListsProcessor(AnnotationInstances.DATA_SOURCE, AnnotationInstances.VALUE_ACCESS));
+        new ListsProcessor(AnnotationInstances.DATA_SOURCE, AnnotationInstances.VALUE_ACCESS));
   }
 
   @SuppressWarnings("unchecked")
   @Override
   public <T extends ODataCallback> T getCallback(final Class<? extends ODataCallback> callbackInterface) {
     return (T) (callbackInterface.isAssignableFrom(ScenarioErrorCallback.class)
-            ? new ScenarioErrorCallback() : callbackInterface.isAssignableFrom(ODataDebugCallback.class)
+        ? new ScenarioErrorCallback() : callbackInterface.isAssignableFrom(ODataDebugCallback.class)
             ? new ScenarioDebugCallback() : super.getCallback(callbackInterface));
   }
 
   /*
-  * Helper classes and methods
-  */
+   * Helper classes and methods
+   */
 
   /**
    * 
@@ -120,7 +120,7 @@ public class AnnotationServiceFactory extends ODataServiceFactory {
 
   }
 
-  private static void initializeSampleData(AnnotationInMemoryDs dataSource) throws ODataApplicationException {
+  private static void initializeSampleData(final AnnotationInMemoryDs dataSource) throws ODataApplicationException {
     DataStore<Team> teamDs = dataSource.getDataStore(Team.class);
     teamDs.create(createTeam("Team Alpha", true));
     teamDs.create(createTeam("Team Beta", false));
@@ -161,9 +161,9 @@ public class AnnotationServiceFactory extends ODataServiceFactory {
   }
 
   private static Employee createEmployee(final String name,
-      Location location, final int age, final Calendar date,
+      final Location location, final int age, final Calendar date,
       final byte[] image, final String imageType, final String imageUrl,
-      Manager manager, Team team, Room room) {
+      final Manager manager, final Team team, final Room room) {
     Employee employee = new Employee();
     employee.setEmployeeName(name);
     employee.setLocation(location);
@@ -178,20 +178,20 @@ public class AnnotationServiceFactory extends ODataServiceFactory {
     return employee;
   }
 
-  private static Team createTeam(String teamName, boolean isScrumTeam) {
+  private static Team createTeam(final String teamName, final boolean isScrumTeam) {
     Team team = new Team();
     team.setName(teamName);
     team.setScrumTeam(isScrumTeam);
     return team;
   }
 
-  private static Building createBuilding(String buildingName) {
+  private static Building createBuilding(final String buildingName) {
     Building b = new Building();
     b.setName(buildingName);
     return b;
   }
 
-  private static Photo createPhoto(String name, ResourceHelper.Format format) {
+  private static Photo createPhoto(final String name, final ResourceHelper.Format format) {
     Photo p = new Photo();
     p.setName(name);
     p.setImageUri("http://localhost/image/" + name);
@@ -201,15 +201,15 @@ public class AnnotationServiceFactory extends ODataServiceFactory {
     return p;
   }
 
-  private static Room createRoom(String name, int seats, int version, Building building) {
+  private static Room createRoom(final String name, final int seats, final int version, final Building building) {
     Room r = new Room();
     r.setName(name);
     r.setSeats(seats);
     r.setVersion(version);
     r.setBuilding(building);
-    
+
     building.addRoom(r);
-    
+
     return r;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Documentation.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Documentation.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Documentation.java
index 25fff56..ec18543 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Documentation.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Documentation.java
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * 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
+ * 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
+ * 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.
+ * 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.api.annotation.edm;
 
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- *  @deprecated: As of Olingo version 1.1.x, replaced by {@link EdmDocumentation}.
+ * @deprecated: As of Olingo version 1.1.x, replaced by {@link EdmDocumentation}.
  */
 @Deprecated
 @Retention(RetentionPolicy.RUNTIME)

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmComplexType.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmComplexType.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmComplexType.java
index 9b135ef..09c6891 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmComplexType.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmComplexType.java
@@ -38,6 +38,7 @@ public @interface EdmComplexType {
    * @return name for the ComplexType
    */
   String name() default "";
+
   /**
    * Define the namespace for the ComplexType.
    * If not set a default value has to be generated by the EDM provider.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java
index d9475f8..1761810 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmConcurrencyControl.java
@@ -25,10 +25,10 @@ import java.lang.annotation.Target;
 
 /**
  * Related to <code>ConcurrencyMode</code> in OData specification.
- * If a property is annotated with {@link EdmConcurrencyControl} 
- * this is equivalent with <code>ConcurrencyMode = FIXED</code>.
- * Default of a property not annotated with {@link EdmConcurrencyControl} 
- * this is equivalent with  <code>ConcurrencyMode = NONE</code>.
+ * If a property is annotated with {@link EdmConcurrencyControl} this is equivalent with <code>ConcurrencyMode =
+ * FIXED</code>.
+ * Default of a property not annotated with {@link EdmConcurrencyControl} this is equivalent with <code>ConcurrencyMode
+ * = NONE</code>.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.ANNOTATION_TYPE)

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmDocumentation.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmDocumentation.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmDocumentation.java
index bb4059b..a25698d 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmDocumentation.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmDocumentation.java
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * 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
+ * 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
+ * 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.
+ * 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.api.annotation.edm;
 
@@ -35,6 +35,7 @@ public @interface EdmDocumentation {
    * @return summary of documentation for EDM element
    */
   String summary() default "";
+
   /**
    * Complete description for this documentation.
    * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntitySet.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntitySet.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntitySet.java
index ed00268..2beb050 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntitySet.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntitySet.java
@@ -39,6 +39,7 @@ public @interface EdmEntitySet {
    * @return name for the EDM Entity Set
    */
   String name() default "";
+
   /**
    * Define the container name for the EDM Entity Set.
    * If not set a default value has to be generated by the EDM provider.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntityType.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntityType.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntityType.java
index 765ba6c..ea554c8 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntityType.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmEntityType.java
@@ -25,7 +25,7 @@ import java.lang.annotation.Target;
 
 /**
  * <p>Annotation for a EDM/CSDL EntityType element.</p>
- * <p>EdmEntityType holds a set of related information like EdmPrimitiveType, EdmComplexType 
+ * <p>EdmEntityType holds a set of related information like EdmPrimitiveType, EdmComplexType
  * and EdmNavigation properties.</p>
  */
 @Retention(RetentionPolicy.RUNTIME)
@@ -38,6 +38,7 @@ public @interface EdmEntityType {
    * @return name for the EDM EntityType
    */
   String name() default "";
+
   /**
    * Define the namespace for the EDM EntityType.
    * If not set a default value has to be generated by the EDM provider.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFacets.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFacets.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFacets.java
index 2b7c591..d220812 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFacets.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFacets.java
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * <p>Annotation for definition of EdmFactes on an EdmProperty (for an EdmEntityType or EdmComplexType 
+ * <p>Annotation for definition of EdmFactes on an EdmProperty (for an EdmEntityType or EdmComplexType
  * which contains the EdmProperty as a field).</p>
  */
 @Retention(RetentionPolicy.RUNTIME)
@@ -37,6 +37,7 @@ public @interface EdmFacets {
    * @return the maximum length of the type in use as Integer
    */
   int maxLength() default -1;
+
   /**
    * The scale of the type in use.
    * A negative value indicates for the EDM provider an unset/default value.
@@ -44,6 +45,7 @@ public @interface EdmFacets {
    * @return the scale of the type in use as Integer
    */
   int scale() default -1;
+
   /**
    * The precision of the type in use.
    * A negative value indicates for the EDM provider an unset/default value.
@@ -51,6 +53,7 @@ public @interface EdmFacets {
    * @return the precision of the type in use as Integer
    */
   int precision() default -1;
+
   /**
    * The information if the type in use is nullable.
    * The default value for nullable is <code>false</code>.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImport.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImport.java
index 1972cb4..02359ca 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImport.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImport.java
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * 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
+ * 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
+ * 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.
+ * 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.api.annotation.edm;
 
@@ -40,30 +40,31 @@ public @interface EdmFunctionImport {
     enum Type {
       SIMPLE, ENTITY, COMPLEX
     }
-    
+
     /**
      * Define the return type for the function import.
      * 
      * @return return type for the function import
      */
     Type type();
+
     /**
      * Define if the return type for the function import is a collection (entity set) or
      * an single entity (entity).
      * 
-     * @return <code>true</code> if a collection is returned, 
-     *          otherwise <code>false</code> if a single entity is returned.
+     * @return <code>true</code> if a collection is returned,
+     * otherwise <code>false</code> if a single entity is returned.
      */
     boolean isCollection() default false;
   }
-  
+
   /**
    * Concrete HttpMethods for a function import as specified in OData.
    */
   enum HttpMethod {
     POST, PUT, GET, MERGE, DELETE, PATCH
   };
-  
+
   /**
    * Define the name for the function import.
    * If not set a default value has to be generated by the EDM provider.
@@ -71,6 +72,7 @@ public @interface EdmFunctionImport {
    * @return name for the function import
    */
   String name() default "";
+
   /**
    * Define the name for the according entity set of the function import.
    * If not set a default value has to be generated by the EDM provider.
@@ -78,12 +80,14 @@ public @interface EdmFunctionImport {
    * @return name for the according entity set of the function import
    */
   String entitySet() default "";
+
   /**
    * Define the return type of this function import
    * 
    * @return return type of this function import
    */
   ReturnType returnType();
+
   /**
    * Define the http method for which this function import is used
    * If not set the default http method <code>GET</code> is used.
@@ -91,6 +95,7 @@ public @interface EdmFunctionImport {
    * @return http method for which this function import is used
    */
   HttpMethod httpMethod() default HttpMethod.GET;
+
   /**
    * Defines additional documentation for this function import.
    * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImportParameter.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImportParameter.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImportParameter.java
index 3301166..2d8d693 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImportParameter.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmFunctionImportParameter.java
@@ -38,10 +38,11 @@ public @interface EdmFunctionImportParameter {
    * @return name for the Function Import Parameter
    */
   String name();
+
   /**
    * Define the EdmSimpleType which is used for the Function Import Parameter in the EDM.
    * <p>
-   * If not explicit set a default value has to be generated by the EDM provider (which should be compatible to the 
+   * If not explicit set a default value has to be generated by the EDM provider (which should be compatible to the
    * java type of the annotated field).
    * <p>
    * If the property is a simple property a EdmSimpleType must be used which can be mapped to the
@@ -52,6 +53,7 @@ public @interface EdmFunctionImportParameter {
    * @return type for the Function Import Parameter as used in the EDM
    */
   EdmType type() default EdmType.NULL;
+
   /**
    * Define the EdmFacets for the Function Import Parameter in the EDM.
    * If not set the default EdmFacet values are used (see {@link EdmFacets}).

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceContent.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceContent.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceContent.java
index ccdcac3..89c9be0 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceContent.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceContent.java
@@ -24,14 +24,13 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * <p>Annotation for definition of an {@link EdmProperty} as <b>media resource content</b> for the 
- * {@link EdmEntityType} 
- * which contains the {@link EdmProperty}. Additionally an {@link EdmEntityType} will be flagged in the EDM as 
+ * <p>Annotation for definition of an {@link EdmProperty} as <b>media resource content</b> for the {@link EdmEntityType}
+ * which contains the {@link EdmProperty}. Additionally an {@link EdmEntityType} will be flagged in the EDM as
  * <code>hasStream == true</code> if an {@link EdmProperty} in conjunction with the {@link EdmMediaResourceContent}
  * annotation is defined.</p>
  * This annotation can not be parameterized, all values like name are defined via the {@link EdmProperty} annotation.
- * In addition the {@link EdmMediaResourceContent} annotation has to be used in conjunction with an 
- * {@link EdmProperty} annotation on a field within an {@link EdmEntityType} annotated class.
+ * In addition the {@link EdmMediaResourceContent} annotation has to be used in conjunction with an {@link EdmProperty}
+ * annotation on a field within an {@link EdmEntityType} annotated class.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceMimeType.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceMimeType.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceMimeType.java
index 67068bb..769d3eb 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceMimeType.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceMimeType.java
@@ -24,14 +24,14 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * <p>Annotation for definition of an {@link EdmProperty} as <b>mime type for the media resource</b> 
+ * <p>Annotation for definition of an {@link EdmProperty} as <b>mime type for the media resource</b>
  * of the {@link EdmEntityType} which contains the {@link EdmProperty}.
  * The value of the {@link EdmMediaResourceMimeType} annotated field will be used as <code>Content-Type</code>
  * of the media content response (of an OData <code>$value</code> request).
  * </p>
  * This annotation can not be parameterized, all values like name are defined via the {@link EdmProperty} annotation.
- * In addition the {@link EdmMediaResourceMimeType} annotation has to be used in conjunction with an 
- * {@link EdmProperty} annotation on a field within an {@link EdmEntityType} annotated class.
+ * In addition the {@link EdmMediaResourceMimeType} annotation has to be used in conjunction with an {@link EdmProperty}
+ * annotation on a field within an {@link EdmEntityType} annotated class.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceSource.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceSource.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceSource.java
index f9ea72d..234f04d 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceSource.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmMediaResourceSource.java
@@ -24,11 +24,11 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * <p>Annotation for definition of an {@link EdmProperty} as <b>media resource source</b> for the {@link EdmEntityType} 
- * which contains the {@link EdmProperty}. 
+ * <p>Annotation for definition of an {@link EdmProperty} as <b>media resource source</b> for the {@link EdmEntityType}
+ * which contains the {@link EdmProperty}.
  * This annotation can not be parameterized, all values like name are defined via the {@link EdmProperty} annotation.
- * In addition the {@link EdmMediaResourceSource} annotation has to be used in conjunction with an 
- * {@link EdmProperty} annotation on a field within an {@link EdmEntityType} annotated class.
+ * In addition the {@link EdmMediaResourceSource} annotation has to be used in conjunction with an {@link EdmProperty}
+ * annotation on a field within an {@link EdmEntityType} annotated class.
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
index 14b304b..909e5ad 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmNavigationProperty.java
@@ -44,8 +44,7 @@ public @interface EdmNavigationProperty {
   public enum Multiplicity {
     ZERO_OR_ONE, ONE, MANY;
   }
-  
-  
+
   /**
    * Define the name for the Navigation Property.
    * If not set a default value has to be generated by the EDM provider.
@@ -53,6 +52,7 @@ public @interface EdmNavigationProperty {
    * @return name for the Navigation Property
    */
   String name() default "";
+
   /**
    * Define the target entity in form of a java class for the Navigation Property.
    * The referenced java class must be annotated with {@link EdmEntityType}.
@@ -62,6 +62,7 @@ public @interface EdmNavigationProperty {
    * @return referenced java class which must be annotated with {@link EdmEntityType}.
    */
   Class<?> toType() default Object.class;
+
   /**
    * Define the name for the related Edm Association Set (of the Navigation Property).
    * If not set a default value has to be generated by the EDM provider.
@@ -69,6 +70,7 @@ public @interface EdmNavigationProperty {
    * @return name for the related Edm Association Set (of the Navigation Property).
    */
   String association() default "";
+
   /**
    * Define the name for the related Edm Role (of the Navigation Property).
    * If not set a default value has to be generated by the EDM provider.
@@ -76,6 +78,7 @@ public @interface EdmNavigationProperty {
    * @return name for the related Edm Role (of the Navigation Property).
    */
   String toRole() default "";
+
   /**
    * Define the multiplicity to the target EdmEntity of the Navigation Property.
    * If not set a default multiplicity of <code>ONE</code> is assumed.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmProperty.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmProperty.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmProperty.java
index cc6fbba..bcd1718 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmProperty.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmProperty.java
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * <p>Annotation for definition of an EdmProperty for an EdmEntityType or EdmComplexType 
+ * <p>Annotation for definition of an EdmProperty for an EdmEntityType or EdmComplexType
  * which contains the EdmProperty as a field.</p>
  * The EdmProperty annotation has to be used on a field within a EdmEntityType or EdmComplexType annotated class.
  */
@@ -34,7 +34,7 @@ public @interface EdmProperty {
   /**
    * Define the EdmSimpleType which is used for the Property in the EDM.
    * <p>
-   * If not explicit set a default value has to be generated by the EDM provider (which should be compatible to the 
+   * If not explicit set a default value has to be generated by the EDM provider (which should be compatible to the
    * java type of the annotated field).
    * <p>
    * If the property is a simple property a EdmSimpleType must be used which can be mapped to the
@@ -45,6 +45,7 @@ public @interface EdmProperty {
    * @return type for the Property as used in the EDM
    */
   EdmType type() default EdmType.NULL;
+
   /**
    * Define the name for the Property.
    * If not set a default value has to be generated by the EDM provider.
@@ -52,6 +53,7 @@ public @interface EdmProperty {
    * @return name for the Property
    */
   String name() default "";
+
   /**
    * Define the EdmFacets for the Property in the EDM.
    * If not set the default EdmFacet values are used (see {@link EdmFacets}).

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmType.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmType.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmType.java
index 1b7b4a3..6352a71 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmType.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/EdmType.java
@@ -20,12 +20,12 @@ package org.apache.olingo.odata2.api.annotation.edm;
 
 /**
  * <p>The EdmTypes which can be used for property definition in the EDM.</p>
- * The available values are based on <code>EdmSimpleTypeKind</code> values with the additional type  
+ * The available values are based on <code>EdmSimpleTypeKind</code> values with the additional type
  * <code>COMPLEX</code> which can be used to explicit define a EdmProperty as complex.
  */
 public enum EdmType {
-  BINARY, BOOLEAN, BYTE, DATE_TIME, DATE_TIME_OFFSET, DECIMAL, DOUBLE, 
-  GUID, INT16, INT32, INT64, SBYTE, SINGLE, STRING, TIME, NULL, 
+  BINARY, BOOLEAN, BYTE, DATE_TIME, DATE_TIME_OFFSET, DECIMAL, DOUBLE,
+  GUID, INT16, INT32, INT64, SBYTE, SINGLE, STRING, TIME, NULL,
   /** Only for explicit definition of a complex property. Not mappable to <code>EdmSimpleTypeKind</code> */
   COMPLEX;
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/2f2553ca/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Facets.java
----------------------------------------------------------------------
diff --git a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Facets.java b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Facets.java
index fec2f8d..cee60e0 100644
--- a/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Facets.java
+++ b/odata2-lib/odata-annotation/src/main/java/org/apache/olingo/odata2/api/annotation/edm/Facets.java
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * 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
+ * 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
+ * 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.
+ * 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.api.annotation.edm;
 
@@ -24,7 +24,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- *  @deprecated: As of Olingo version 1.1.x, replaced by {@link EdmFacets}.
+ * @deprecated: As of Olingo version 1.1.x, replaced by {@link EdmFacets}.
  */
 @Deprecated
 @Retention(RetentionPolicy.RUNTIME)


Mime
View raw message