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 2013/07/31 10:12:46 UTC

[01/22] git commit: refactoring groupid and artifactid

Updated Branches:
  refs/heads/master e9bd183f7 -> 1e5280b74


refactoring groupid and artifactid


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

Branch: refs/heads/master
Commit: 622a0695859cc3f6e420c111a8f17a6e3d00f810
Parents: e9bd183
Author: Stephan Klevenz <st...@sap.com>
Authored: Wed Jul 31 09:37:38 2013 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Wed Jul 31 09:37:38 2013 +0200

----------------------------------------------------------------------
 jpa-annotation/pom.xml    |  7 +++---
 jpa-api/pom.xml           |  7 +++---
 jpa-core/pom.xml          |  7 +++---
 odata-api/pom.xml         |  7 +++---
 odata-core/pom.xml        |  7 +++---
 odata-fit/pom.xml         |  7 +++---
 odata-ref/pom.xml         |  7 +++---
 odata-testutil/pom.xml    |  7 +++---
 odata-web/pom.xml         |  9 ++++---
 pom.xml                   | 17 +++++++++++---
 src/checkstyle/config.xml | 53 ++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 103 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/jpa-annotation/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-annotation/pom.xml b/jpa-annotation/pom.xml
index 0c59c58..ab90dab 100644
--- a/jpa-annotation/pom.xml
+++ b/jpa-annotation/pom.xml
@@ -23,13 +23,14 @@
 	<modelVersion>4.0.0</modelVersion>
 	
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
-	<artifactId>org.apache.olingo.odata2.api.annotation</artifactId>
+	<artifactId>api.annotation</artifactId>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/jpa-api/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-api/pom.xml b/jpa-api/pom.xml
index c943101..cca1a14 100644
--- a/jpa-api/pom.xml
+++ b/jpa-api/pom.xml
@@ -22,14 +22,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
-	<artifactId>org.apache.olingo.odata2.processor.api</artifactId>
+	<artifactId>jpa.processor.api</artifactId>
 	<packaging>jar</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<dependencies>
 		<!-- JPA Support -->

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/jpa-core/pom.xml
----------------------------------------------------------------------
diff --git a/jpa-core/pom.xml b/jpa-core/pom.xml
index fc2c39e..c1d1543 100644
--- a/jpa-core/pom.xml
+++ b/jpa-core/pom.xml
@@ -22,14 +22,15 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
-	<artifactId>org.apache.olingo.odata2.processor.core</artifactId>
+	<artifactId>jpa.processor.core</artifactId>
 	<packaging>jar</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<dependencies>
 		<dependency>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/odata-api/pom.xml
----------------------------------------------------------------------
diff --git a/odata-api/pom.xml b/odata-api/pom.xml
index 54d5213..0773ac8 100644
--- a/odata-api/pom.xml
+++ b/odata-api/pom.xml
@@ -21,12 +21,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.apache.olingo.odata2.api</artifactId>
+	<artifactId>api</artifactId>
 	<packaging>jar</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/odata-core/pom.xml
----------------------------------------------------------------------
diff --git a/odata-core/pom.xml b/odata-core/pom.xml
index 79092ce..9efa42f 100644
--- a/odata-core/pom.xml
+++ b/odata-core/pom.xml
@@ -21,12 +21,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.apache.olingo.odata2.core</artifactId>
+	<artifactId>core</artifactId>
 	<packaging>jar</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/odata-fit/pom.xml
----------------------------------------------------------------------
diff --git a/odata-fit/pom.xml b/odata-fit/pom.xml
index ced146d..21f05bc 100644
--- a/odata-fit/pom.xml
+++ b/odata-fit/pom.xml
@@ -21,12 +21,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.apache.olingo.odata2.fit</artifactId>
+	<artifactId>fit</artifactId>
 	<packaging>jar</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/odata-ref/pom.xml
----------------------------------------------------------------------
diff --git a/odata-ref/pom.xml b/odata-ref/pom.xml
index 79c5ef1..ccef1b5 100644
--- a/odata-ref/pom.xml
+++ b/odata-ref/pom.xml
@@ -21,12 +21,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.apache.olingo.odata2.ref</artifactId>
+	<artifactId>ref</artifactId>
 	<packaging>jar</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/odata-testutil/pom.xml
----------------------------------------------------------------------
diff --git a/odata-testutil/pom.xml b/odata-testutil/pom.xml
index 8187890..5a88d2c 100644
--- a/odata-testutil/pom.xml
+++ b/odata-testutil/pom.xml
@@ -21,12 +21,13 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.apache.olingo.odata2.testutil</artifactId>
+	<artifactId>testutil</artifactId>
 	<packaging>jar</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/odata-web/pom.xml
----------------------------------------------------------------------
diff --git a/odata-web/pom.xml b/odata-web/pom.xml
index feb3ef5..0845d38 100644
--- a/odata-web/pom.xml
+++ b/odata-web/pom.xml
@@ -21,19 +21,18 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<artifactId>org.apache.olingo.odata2.ref.web</artifactId>
+	<artifactId>ref.web</artifactId>
 	<packaging>war</packaging>
+	<name>${project.groupId}-${project.artifactId}</name>
 
 	<parent>
-		<groupId>org.apache.olingo</groupId>
-		<artifactId>org.apache.olingo.odata2.parent</artifactId>
+		<groupId>org.apache.olingo.odata2</groupId>
+		<artifactId>parent</artifactId>
 		<version>1.0.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
 	<build>
-		<finalName>org.apache.olingo.odata2.ref.web</finalName>
-
 		<resources>
 			<resource>
 				<directory>src/main/version</directory>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a6fd381..f1fb30b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,11 +3,12 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.apache.olingo</groupId>
-	<artifactId>org.apache.olingo.odata2.parent</artifactId>
+	<groupId>org.apache.olingo.odata2</groupId>
+	<artifactId>parent</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-
+	<name>${project.groupId}-${project.artifactId}</name>
+	
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
@@ -117,6 +118,7 @@
 	</modules>
 
 	<build>
+		<finalName>${project.groupId}-${project.artifactId}</finalName>
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -179,6 +181,13 @@
 
 		<plugins>
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+			<plugin>
 				<groupId>com.keyboardsamurais.maven</groupId>
 				<artifactId>maven-timestamp-plugin</artifactId>
 				<configuration>
@@ -205,6 +214,8 @@
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
 				<configuration>
+					<addGroupIdToProjectName>true</addGroupIdToProjectName>
+					<addVersionToProjectName>true</addVersionToProjectName>
 					<wtpversion>2.0</wtpversion>
 					<downloadSources>true</downloadSources>
 					<downloadJavadocs>true</downloadJavadocs>

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/622a0695/src/checkstyle/config.xml
----------------------------------------------------------------------
diff --git a/src/checkstyle/config.xml b/src/checkstyle/config.xml
new file mode 100644
index 0000000..9e7049e
--- /dev/null
+++ b/src/checkstyle/config.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+
+<!--
+    This configuration file was written by the eclipse-cs plugin configuration editor
+-->
+<!--
+    Checkstyle-Configuration: Olingo
+    Description: none
+-->
+<module name="Checker">
+  <property name="severity" value="warning"/>
+  <module name="TreeWalker">
+    <module name="FileContentsHolder"/>
+    <module name="IllegalImport">
+      <property name="severity" value="info"/>
+      <property name="illegalPkgs" value="java.awt, javax.swing"/>
+    </module>
+    <module name="IllegalCatch">
+      <property name="severity" value="error"/>
+      <property name="illegalClassNames" value="java.lang.Error, java.lang.Throwable"/>
+    </module>
+    <module name="UnusedImports">
+      <property name="severity" value="info"/>
+    </module>
+    <module name="NoFinalizer">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="RegexpSinglelineJava">
+      <property name="severity" value="warning"/>
+      <property name="format" value="System\.exit|System\.gc\(\)|System\.runFinalization\(\)|System\.setErr|System\.setIn|System\.setOut|System\.setProperties|System\.setProperty|System\.setSecurityManager|extends[ \t]+Throwable|extends[ \t]+java\.lang\.Throwable|extends[ \t]+Error|extends[ \t]+java\.lang\.Error"/>
+      <property name="ignoreComments" value="true"/>
+    </module>
+    <module name="DefaultComesLast">
+      <property name="severity" value="warning"/>
+    </module>
+    <module name="EmptyBlock">
+      <property name="severity" value="warning"/>
+      <property name="option" value="text"/>
+      <property name="tokens" value="LITERAL_WHILE,LITERAL_FINALLY,LITERAL_IF"/>
+    </module>
+    <module name="LeftCurly">
+      <property name="severity" value="warning"/>
+    </module>
+    <module name="NeedBraces">
+      <property name="severity" value="warning"/>
+    </module>
+    <module name="RightCurly">
+      <property name="severity" value="warning"/>
+    </module>
+  </module>
+  <module name="SuppressionCommentFilter"/>
+</module>


[18/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
index 7d96345..12a767e 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmProperty.java
@@ -56,8 +56,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPATypeConvertor;
 
-public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
-    JPAEdmPropertyView, JPAEdmComplexPropertyView {
+public class JPAEdmProperty extends JPAEdmBaseViewImpl implements JPAEdmPropertyView, JPAEdmComplexPropertyView {
 
   private JPAEdmSchemaView schemaView;
   private JPAEdmEntityTypeView entityTypeView;
@@ -75,16 +74,14 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
   public JPAEdmProperty(final JPAEdmSchemaView view) {
     super(view);
     schemaView = view;
-    entityTypeView = schemaView.getJPAEdmEntityContainerView()
-        .getJPAEdmEntitySetView().getJPAEdmEntityTypeView();
+    entityTypeView = schemaView.getJPAEdmEntityContainerView().getJPAEdmEntitySetView().getJPAEdmEntityTypeView();
     complexTypeView = schemaView.getJPAEdmComplexTypeView();
     navigationPropertyView = new JPAEdmNavigationProperty(schemaView);
     isBuildModeComplexType = false;
     associationCount = new HashMap<String, Integer>();
   }
 
-  public JPAEdmProperty(final JPAEdmSchemaView schemaView,
-      final JPAEdmComplexTypeView view) {
+  public JPAEdmProperty(final JPAEdmSchemaView schemaView, final JPAEdmComplexTypeView view) {
     super(view);
     this.schemaView = schemaView;
     complexTypeView = view;
@@ -126,8 +123,7 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
   }
 
   @Override
-  public JPAEdmNavigationPropertyView getJPAEdmNavigationPropertyView()
-  {
+  public JPAEdmNavigationPropertyView getJPAEdmNavigationPropertyView() {
     return navigationPropertyView;
   }
 
@@ -182,13 +178,10 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
       String targetEntityName = null;
       String entityTypeName = null;
       if (isBuildModeComplexType) {
-        jpaAttributes = sortInAscendingOrder(complexTypeView.getJPAEmbeddableType()
-            .getAttributes());
-        entityTypeName = complexTypeView.getJPAEmbeddableType().getJavaType()
-            .getSimpleName();
+        jpaAttributes = sortInAscendingOrder(complexTypeView.getJPAEmbeddableType().getAttributes());
+        entityTypeName = complexTypeView.getJPAEmbeddableType().getJavaType().getSimpleName();
       } else {
-        jpaAttributes = sortInAscendingOrder(entityTypeView.getJPAEntityType()
-            .getAttributes());
+        jpaAttributes = sortInAscendingOrder(entityTypeView.getJPAEntityType().getAttributes());
         entityTypeName = entityTypeView.getJPAEntityType().getName();
       }
 
@@ -200,23 +193,18 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
           continue;
         }
 
-        PersistentAttributeType attributeType = currentAttribute
-            .getPersistentAttributeType();
+        PersistentAttributeType attributeType = currentAttribute.getPersistentAttributeType();
 
         switch (attributeType) {
         case BASIC:
 
           currentSimpleProperty = new SimpleProperty();
-          JPAEdmNameBuilder
-              .build((JPAEdmPropertyView) JPAEdmProperty.this, isBuildModeComplexType);
+          JPAEdmNameBuilder.build((JPAEdmPropertyView) JPAEdmProperty.this, isBuildModeComplexType);
 
-          EdmSimpleTypeKind simpleTypeKind = JPATypeConvertor
-              .convertToEdmSimpleType(currentAttribute
-                  .getJavaType(), currentAttribute);
+          EdmSimpleTypeKind simpleTypeKind = JPATypeConvertor.convertToEdmSimpleType(currentAttribute.getJavaType(), currentAttribute);
 
           currentSimpleProperty.setType(simpleTypeKind);
-          currentSimpleProperty
-              .setFacets(setFacets(currentAttribute));
+          currentSimpleProperty.setFacets(setFacets(currentAttribute));
 
           properties.add(currentSimpleProperty);
 
@@ -231,50 +219,35 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
 
           break;
         case EMBEDDED:
-          ComplexType complexType = complexTypeView
-              .searchEdmComplexType(currentAttribute.getJavaType().getName());
+          ComplexType complexType = complexTypeView.searchEdmComplexType(currentAttribute.getJavaType().getName());
 
           if (complexType == null) {
-            JPAEdmComplexTypeView complexTypeViewLocal = new JPAEdmComplexType(
-                schemaView, currentAttribute);
+            JPAEdmComplexTypeView complexTypeViewLocal = new JPAEdmComplexType(schemaView, currentAttribute);
             complexTypeViewLocal.getBuilder().build();
             complexType = complexTypeViewLocal.getEdmComplexType();
             complexTypeView.addJPAEdmCompleTypeView(complexTypeViewLocal);
 
           }
 
-          if (isBuildModeComplexType == false
-              && entityTypeView.getJPAEntityType().getIdType()
-                  .getJavaType()
-                  .equals(currentAttribute.getJavaType())) {
+          if (isBuildModeComplexType == false && entityTypeView.getJPAEntityType().getIdType().getJavaType().equals(currentAttribute.getJavaType())) {
 
             if (keyView == null) {
-              keyView = new JPAEdmKey(complexTypeView,
-                  JPAEdmProperty.this);
+              keyView = new JPAEdmKey(complexTypeView, JPAEdmProperty.this);
             }
             keyView.getBuilder().build();
             complexTypeView.expandEdmComplexType(complexType, properties, currentAttribute.getName());
-          }
-          else {
+          } else {
             currentComplexProperty = new ComplexProperty();
             if (isBuildModeComplexType) {
-              JPAEdmNameBuilder
-                  .build((JPAEdmComplexPropertyView) JPAEdmProperty.this,
-                      complexTypeView.getJPAEmbeddableType().getJavaType().getSimpleName());
+              JPAEdmNameBuilder.build((JPAEdmComplexPropertyView) JPAEdmProperty.this, complexTypeView.getJPAEmbeddableType().getJavaType().getSimpleName());
             } else {
-              JPAEdmNameBuilder
-                  .build((JPAEdmComplexPropertyView) JPAEdmProperty.this,
-                      JPAEdmProperty.this);
+              JPAEdmNameBuilder.build((JPAEdmComplexPropertyView) JPAEdmProperty.this, JPAEdmProperty.this);
             }
-            currentComplexProperty.setType(new FullQualifiedName(
-                schemaView.getEdmSchema().getNamespace(),
-                complexType.getName()));
-            currentComplexProperty
-                .setFacets(setFacets(currentAttribute));
+            currentComplexProperty.setType(new FullQualifiedName(schemaView.getEdmSchema().getNamespace(), complexType.getName()));
+            currentComplexProperty.setFacets(setFacets(currentAttribute));
             properties.add(currentComplexProperty);
             List<String> nonKeyComplexTypes = schemaView.getNonKeyComplexTypeList();
-            if (!nonKeyComplexTypes.contains(currentComplexProperty.getType().getName()))
-            {
+            if (!nonKeyComplexTypes.contains(currentComplexProperty.getType().getName())) {
               schemaView.addNonKeyComplexName(currentComplexProperty.getType().getName());
             }
           }
@@ -295,16 +268,14 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
             associationView.addJPAEdmAssociationView(associationViewLocal, associationEndView);
           }
 
-          JPAEdmReferentialConstraintView refConstraintView = new JPAEdmReferentialConstraint(
-              associationView, entityTypeView, JPAEdmProperty.this);
+          JPAEdmReferentialConstraintView refConstraintView = new JPAEdmReferentialConstraint(associationView, entityTypeView, JPAEdmProperty.this);
           refConstraintView.getBuilder().build();
 
           if (refConstraintView.isExists()) {
             associationView.addJPAEdmRefConstraintView(refConstraintView);
           }
 
-          if (navigationPropertyView == null)
-          {
+          if (navigationPropertyView == null) {
             navigationPropertyView = new JPAEdmNavigationProperty(schemaView);
           }
           currentEntityName = entityTypeView.getJPAEntityType().getName();
@@ -348,27 +319,22 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
       return jpaAttributeList;
     }
 
-    private EdmFacets setFacets(final Attribute<?, ?> jpaAttribute)
-        throws ODataJPAModelException, ODataJPARuntimeException {
+    private EdmFacets setFacets(final Attribute<?, ?> jpaAttribute) throws ODataJPAModelException, ODataJPARuntimeException {
 
       Facets facets = new Facets();
       if (jpaAttribute.getJavaMember() instanceof AnnotatedElement) {
-        Column column = ((AnnotatedElement) jpaAttribute
-            .getJavaMember()).getAnnotation(Column.class);
+        Column column = ((AnnotatedElement) jpaAttribute.getJavaMember()).getAnnotation(Column.class);
         if (column != null) {
-          EdmSimpleTypeKind attrEmdType = JPATypeConvertor
-              .convertToEdmSimpleType(jpaAttribute.getJavaType(), jpaAttribute);
+          EdmSimpleTypeKind attrEmdType = JPATypeConvertor.convertToEdmSimpleType(jpaAttribute.getJavaType(), jpaAttribute);
           if (column.nullable()) {
             facets.setNullable(true);
           } else {
             facets.setNullable(false);
           }
-          if (column.length() != 0
-              && attrEmdType.equals(EdmSimpleTypeKind.String)) {
+          if (column.length() != 0 && attrEmdType.equals(EdmSimpleTypeKind.String)) {
             facets.setMaxLength(column.length());
           }
-          if (column.precision() != 0
-              && attrEmdType.equals(EdmSimpleTypeKind.Double)) {
+          if (column.precision() != 0 && attrEmdType.equals(EdmSimpleTypeKind.Double)) {
             facets.setPrecision(column.precision());
           }
         }
@@ -389,13 +355,12 @@ public class JPAEdmProperty extends JPAEdmBaseViewImpl implements
   }
 
   private boolean isExcluded(final JPAEdmPropertyView jpaEdmPropertyView, final String jpaEntityTypeName, final String jpaAttributeName) {
-    JPAEdmMappingModelAccess mappingModelAccess = jpaEdmPropertyView
-        .getJPAEdmMappingModelAccess();
+    JPAEdmMappingModelAccess mappingModelAccess = jpaEdmPropertyView.getJPAEdmMappingModelAccess();
     boolean isExcluded = false;
     if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
       // Exclusion of a simple property in a complex type
       if (isBuildModeComplexType && mappingModelAccess.checkExclusionOfJPAEmbeddableAttributeType(jpaEntityTypeName, jpaAttributeName)
-          // Exclusion of a simple property of an Entity Type
+      // Exclusion of a simple property of an Entity Type
           || (!isBuildModeComplexType && mappingModelAccess.checkExclusionOfJPAAttributeType(jpaEntityTypeName, jpaAttributeName))) {
         isExcluded = true;
       }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
index df39fc3..850e473 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraint.java
@@ -29,8 +29,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstra
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView.RoleType;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView;
 
-public class JPAEdmReferentialConstraint extends JPAEdmBaseViewImpl implements
-    JPAEdmReferentialConstraintView {
+public class JPAEdmReferentialConstraint extends JPAEdmBaseViewImpl implements JPAEdmReferentialConstraintView {
 
   private JPAEdmRefConstraintBuilder builder = null;
 
@@ -48,8 +47,7 @@ public class JPAEdmReferentialConstraint extends JPAEdmBaseViewImpl implements
 
   private String relationShipName;
 
-  public JPAEdmReferentialConstraint(final JPAEdmAssociationView associationView,
-      final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
+  public JPAEdmReferentialConstraint(final JPAEdmAssociationView associationView, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
     super(associationView);
     this.associationView = associationView;
     this.propertyView = propertyView;
@@ -102,32 +100,26 @@ public class JPAEdmReferentialConstraint extends JPAEdmBaseViewImpl implements
       if (firstBuild) {
         firstBuild();
       } else {
-        if (exists && !firstBuild
-            && principalRoleView.isConsistent() == false) {
+        if (exists && !firstBuild && principalRoleView.isConsistent() == false) {
           principalRoleView.getBuilder().build();
         }
 
-        if (exists && !firstBuild
-            && dependentRoleView.isConsistent() == false) {
+        if (exists && !firstBuild && dependentRoleView.isConsistent() == false) {
           dependentRoleView.getBuilder().build();
         }
       }
 
       if (principalRoleView.isConsistent()) {
-        referentialConstraint.setPrincipal(principalRoleView
-            .getEdmReferentialConstraintRole());
+        referentialConstraint.setPrincipal(principalRoleView.getEdmReferentialConstraintRole());
       }
 
       if (dependentRoleView.isConsistent()) {
-        referentialConstraint.setDependent(dependentRoleView
-            .getEdmReferentialConstraintRole());
+        referentialConstraint.setDependent(dependentRoleView.getEdmReferentialConstraintRole());
       }
 
-      exists = principalRoleView.isExists()
-          & dependentRoleView.isExists();
+      exists = principalRoleView.isExists() & dependentRoleView.isExists();
 
-      isConsistent = principalRoleView.isConsistent()
-          & dependentRoleView.isConsistent();
+      isConsistent = principalRoleView.isConsistent() & dependentRoleView.isConsistent();
 
     }
 
@@ -135,14 +127,10 @@ public class JPAEdmReferentialConstraint extends JPAEdmBaseViewImpl implements
       firstBuild = false;
       if (principalRoleView == null && dependentRoleView == null) {
 
-        principalRoleView = new JPAEdmReferentialConstraintRole(
-            RoleType.PRINCIPAL, entityTypeView, propertyView,
-            associationView);
+        principalRoleView = new JPAEdmReferentialConstraintRole(RoleType.PRINCIPAL, entityTypeView, propertyView, associationView);
         principalRoleView.getBuilder().build();
 
-        dependentRoleView = new JPAEdmReferentialConstraintRole(
-            RoleType.DEPENDENT, entityTypeView, propertyView,
-            associationView);
+        dependentRoleView = new JPAEdmReferentialConstraintRole(RoleType.DEPENDENT, entityTypeView, propertyView, associationView);
         dependentRoleView.getBuilder().build();
 
         if (referentialConstraint == null) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
index 54ccfec..c43eba1 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRole.java
@@ -42,8 +42,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmMapping;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView;
 
-public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl
-    implements JPAEdmReferentialConstraintRoleView {
+public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl implements JPAEdmReferentialConstraintRoleView {
   /*
    * Static Buffer
    */
@@ -67,11 +66,7 @@ public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl
   private JPAEdmRefConstraintRoleBuilder builder;
   private ReferentialConstraintRole currentRole;
 
-  public JPAEdmReferentialConstraintRole(
-      final JPAEdmReferentialConstraintRoleView.RoleType roleType,
-      final JPAEdmEntityTypeView entityTypeView,
-      final JPAEdmPropertyView propertyView,
-      final JPAEdmAssociationView associationView) {
+  public JPAEdmReferentialConstraintRole(final JPAEdmReferentialConstraintRoleView.RoleType roleType, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView, final JPAEdmAssociationView associationView) {
 
     super(entityTypeView);
     this.entityTypeView = entityTypeView;
@@ -132,13 +127,9 @@ public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl
         try {
           buildRole();
         } catch (SecurityException e) {
-          throw ODataJPAModelException.throwException(
-              ODataJPAModelException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPAModelException.throwException(ODataJPAModelException.GENERAL.addContent(e.getMessage()), e);
         } catch (NoSuchFieldException e) {
-          throw ODataJPAModelException.throwException(
-              ODataJPAModelException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPAModelException.throwException(ODataJPAModelException.GENERAL.addContent(e.getMessage()), e);
         }
       }
 
@@ -174,35 +165,25 @@ public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl
         EntityType edmEntityType = null;
 
         if (roleType == RoleType.PRINCIPAL) {
-          jpaAttributeType = jpaAttribute.getJavaType()
-              .getSimpleName();
+          jpaAttributeType = jpaAttribute.getJavaType().getSimpleName();
           if (jpaAttributeType.equals("List")) {
-            Type type = ((ParameterizedType) jpaAttribute
-                .getJavaMember().getDeclaringClass()
-                .getDeclaredField(jpaAttribute.getName())
-                .getGenericType()).getActualTypeArguments()[0];
+            Type type = ((ParameterizedType) jpaAttribute.getJavaMember().getDeclaringClass().getDeclaredField(jpaAttribute.getName()).getGenericType()).getActualTypeArguments()[0];
             int lastIndexOfDot = type.toString().lastIndexOf(".");
-            jpaAttributeType = type.toString().substring(
-                lastIndexOfDot + 1);
+            jpaAttributeType = type.toString().substring(lastIndexOfDot + 1);
           }
-          edmEntityType = entityTypeView
-              .searchEdmEntityType(jpaAttributeType);
+          edmEntityType = entityTypeView.searchEdmEntityType(jpaAttributeType);
 
         }
 
         else if (roleType == RoleType.DEPENDENT) {
-          edmEntityType = entityTypeView
-              .searchEdmEntityType(jpaAttribute
-                  .getDeclaringType().getJavaType()
-                  .getSimpleName());
+          edmEntityType = entityTypeView.searchEdmEntityType(jpaAttribute.getDeclaringType().getJavaType().getSimpleName());
         }
 
         List<PropertyRef> propertyRefs = new ArrayList<PropertyRef>();
         if (edmEntityType != null) {
           for (String columnName : jpaColumnNames) {
             for (Property property : edmEntityType.getProperties()) {
-              if (columnName.equals(((JPAEdmMapping) property
-                  .getMapping()).getJPAColumnName())) {
+              if (columnName.equals(((JPAEdmMapping) property.getMapping()).getJPAColumnName())) {
                 PropertyRef propertyRef = new PropertyRef();
                 propertyRef.setName(property.getName());
                 propertyRefs.add(propertyRef);
@@ -221,8 +202,7 @@ public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl
             isConsistent = true;
           } else {
             end = association.getEnd2();
-            if (end.getType().getName()
-                .equals(edmEntityType.getName())) {
+            if (end.getType().getName().equals(edmEntityType.getName())) {
               currentRole.setRole(end.getRole());
               isConsistent = true;
             }
@@ -248,18 +228,15 @@ public class JPAEdmReferentialConstraintRole extends JPAEdmBaseViewImpl
         return;
       }
 
-      AnnotatedElement annotatedElement = (AnnotatedElement) jpaAttribute
-          .getJavaMember();
+      AnnotatedElement annotatedElement = (AnnotatedElement) jpaAttribute.getJavaMember();
 
       if (annotatedElement == null) {
         return;
       }
 
-      JoinColumn joinColumn = annotatedElement
-          .getAnnotation(JoinColumn.class);
+      JoinColumn joinColumn = annotatedElement.getAnnotation(JoinColumn.class);
       if (joinColumn == null) {
-        JoinColumns joinColumns = annotatedElement
-            .getAnnotation(JoinColumns.class);
+        JoinColumns joinColumns = annotatedElement.getAnnotation(JoinColumns.class);
 
         if (joinColumns != null) {
           JoinColumn[] joinColumnArray = joinColumns.value();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
index 40a92a3..a18fbbd 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchema.java
@@ -39,8 +39,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmSchema extends JPAEdmBaseViewImpl implements
-    JPAEdmSchemaView {
+public class JPAEdmSchema extends JPAEdmBaseViewImpl implements JPAEdmSchemaView {
 
   private Schema schema;
   private JPAEdmComplexTypeView complexTypeView;
@@ -118,8 +117,7 @@ public class JPAEdmSchema extends JPAEdmBaseViewImpl implements
      * ************************************************************
      */
     @Override
-    public void build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
       schema = new Schema();
       JPAEdmNameBuilder.build(JPAEdmSchema.this);
@@ -130,31 +128,22 @@ public class JPAEdmSchema extends JPAEdmBaseViewImpl implements
       complexTypeView.getBuilder().build();
 
       if (getJPAEdmExtension() != null) {
-        getJPAEdmExtension()
-            .extend(JPAEdmSchema.this);
+        getJPAEdmExtension().extend(JPAEdmSchema.this);
       }
 
       entityContainerView = new JPAEdmEntityContainer(JPAEdmSchema.this);
       entityContainerView.getBuilder().build();
-      schema.setEntityContainers(entityContainerView
-          .getConsistentEdmEntityContainerList());
-
-      JPAEdmEntitySetView entitySetView = entityContainerView
-          .getJPAEdmEntitySetView();
-      if (entitySetView.isConsistent()
-          && entitySetView.getJPAEdmEntityTypeView() != null) {
-        JPAEdmEntityTypeView entityTypeView = entitySetView
-            .getJPAEdmEntityTypeView();
-        if (entityTypeView.isConsistent()
-            && !entityTypeView.getConsistentEdmEntityTypes()
-                .isEmpty()) {
-          schema.setEntityTypes(entityTypeView
-              .getConsistentEdmEntityTypes());
+      schema.setEntityContainers(entityContainerView.getConsistentEdmEntityContainerList());
+
+      JPAEdmEntitySetView entitySetView = entityContainerView.getJPAEdmEntitySetView();
+      if (entitySetView.isConsistent() && entitySetView.getJPAEdmEntityTypeView() != null) {
+        JPAEdmEntityTypeView entityTypeView = entitySetView.getJPAEdmEntityTypeView();
+        if (entityTypeView.isConsistent() && !entityTypeView.getConsistentEdmEntityTypes().isEmpty()) {
+          schema.setEntityTypes(entityTypeView.getConsistentEdmEntityTypes());
         }
       }
       if (complexTypeView.isConsistent()) {
-        List<ComplexType> complexTypes = complexTypeView
-            .getConsistentEdmComplexTypes();
+        List<ComplexType> complexTypes = complexTypeView.getConsistentEdmComplexTypes();
         List<ComplexType> existingComplexTypes = new ArrayList<ComplexType>();
         for (ComplexType complexType : complexTypes) {
           if (complexType != null && nonKeyComplexList.contains(complexType.getName())) {//null check for exclude
@@ -167,21 +156,16 @@ public class JPAEdmSchema extends JPAEdmBaseViewImpl implements
       }
 
       List<String> existingAssociationList = new ArrayList<String>();
-      if (associationView.isConsistent()
-          && !associationView.getConsistentEdmAssociationList()
-              .isEmpty()) {
+      if (associationView.isConsistent() && !associationView.getConsistentEdmAssociationList().isEmpty()) {
 
-        List<Association> consistentAssociationList = associationView
-            .getConsistentEdmAssociationList();
+        List<Association> consistentAssociationList = associationView.getConsistentEdmAssociationList();
         schema.setAssociations(consistentAssociationList);
         for (Association association : consistentAssociationList) {
           existingAssociationList.add(association.getName());
         }
 
       }
-      List<EntityType> entityTypes = entityContainerView
-          .getJPAEdmEntitySetView().getJPAEdmEntityTypeView()
-          .getConsistentEdmEntityTypes();
+      List<EntityType> entityTypes = entityContainerView.getJPAEdmEntitySetView().getJPAEdmEntityTypeView().getConsistentEdmEntityTypes();
       List<NavigationProperty> navigationProperties;
       if (entityTypes != null && !entityTypes.isEmpty()) {
         for (EntityType entityType : entityTypes) {
@@ -191,18 +175,14 @@ public class JPAEdmSchema extends JPAEdmBaseViewImpl implements
           if (navigationProperties != null) {
             consistentNavigationProperties = new ArrayList<NavigationProperty>();
             for (NavigationProperty navigationProperty : navigationProperties) {
-              if (existingAssociationList
-                  .contains(navigationProperty
-                      .getRelationship().getName())) {
-                consistentNavigationProperties
-                    .add(navigationProperty);
+              if (existingAssociationList.contains(navigationProperty.getRelationship().getName())) {
+                consistentNavigationProperties.add(navigationProperty);
               }
             }
             if (consistentNavigationProperties.isEmpty()) {
               entityType.setNavigationProperties(null);
             } else {
-              entityType
-                  .setNavigationProperties(consistentNavigationProperties);
+              entityType.setNavigationProperties(consistentNavigationProperties);
             }
           }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/JPAEntityParserTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/JPAEntityParserTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/JPAEntityParserTest.java
index 454b64e..c57ec14 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/JPAEntityParserTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/JPAEntityParserTest.java
@@ -30,9 +30,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.easymock.EasyMock;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmException;
 import org.apache.olingo.odata2.api.edm.EdmMapping;
 import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
@@ -43,6 +40,8 @@ import org.apache.olingo.odata2.api.edm.EdmTypeKind;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.easymock.EasyMock;
+import org.junit.Test;
 
 public class JPAEntityParserTest {
   /*
@@ -61,8 +60,7 @@ public class JPAEntityParserTest {
   public void testparse2EdmPropertyValueMap() {
     JPAEntityParser resultParser = JPAEntityParser.create();
     Object jpaEntity = new demoItem("abc", 10);
-    EdmStructuralType structuralType = EasyMock
-        .createMock(EdmStructuralType.class);
+    EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
     EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
     EdmType edmType = EasyMock.createMock(EdmType.class);
     EdmProperty edmTyped01 = EasyMock.createMock(EdmProperty.class);
@@ -71,8 +69,7 @@ public class JPAEntityParserTest {
     EdmMapping edmMapping01 = EasyMock.createMock(EdmMapping.class);
 
     try {
-      EasyMock.expect(edmType.getKind())
-          .andStubReturn(EdmTypeKind.SIMPLE);
+      EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
       EasyMock.expect(edmTyped.getName()).andStubReturn("identifier");
       EasyMock.replay(edmType);
       EasyMock.expect(edmMapping.getInternalName()).andStubReturn("id");
@@ -80,41 +77,33 @@ public class JPAEntityParserTest {
       EasyMock.expect(edmTyped.getType()).andStubReturn(edmType);
       EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
       EasyMock.replay(edmTyped);
-      EasyMock.expect(structuralType.getProperty("identifier"))
-          .andStubReturn(edmTyped);
+      EasyMock.expect(structuralType.getProperty("identifier")).andStubReturn(edmTyped);
 
-      EasyMock.expect(edmType01.getKind()).andStubReturn(
-          EdmTypeKind.SIMPLE);
+      EasyMock.expect(edmType01.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
       EasyMock.expect(edmTyped01.getName()).andStubReturn("Value");
       EasyMock.replay(edmType01);
-      EasyMock.expect(edmMapping01.getInternalName()).andStubReturn(
-          "value");
+      EasyMock.expect(edmMapping01.getInternalName()).andStubReturn("value");
       EasyMock.replay(edmMapping01);
       EasyMock.expect(edmTyped01.getType()).andStubReturn(edmType01);
-      EasyMock.expect(edmTyped01.getMapping())
-          .andStubReturn(edmMapping01);
+      EasyMock.expect(edmTyped01.getMapping()).andStubReturn(edmMapping01);
       EasyMock.replay(edmTyped01);
-      EasyMock.expect(structuralType.getProperty("value")).andStubReturn(
-          edmTyped01);
+      EasyMock.expect(structuralType.getProperty("value")).andStubReturn(edmTyped01);
 
       List<String> propNames = new ArrayList<String>();
       propNames.add("identifier");
       propNames.add("value");
-      EasyMock.expect(structuralType.getPropertyNames()).andReturn(
-          propNames);
+      EasyMock.expect(structuralType.getPropertyNames()).andReturn(propNames);
       EasyMock.replay(structuralType);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     try {
       Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, structuralType);
       assertEquals(2, result.size());
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -123,8 +112,7 @@ public class JPAEntityParserTest {
   public void testparse2EdmPropertyValueMapEdmExcep() {
     JPAEntityParser resultParser = JPAEntityParser.create();
     Object jpaEntity = new demoItem("abc", 10);
-    EdmStructuralType structuralType = EasyMock
-        .createMock(EdmStructuralType.class);
+    EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
     EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
     EdmType edmType = EasyMock.createMock(EdmType.class);
     EdmProperty edmTyped01 = EasyMock.createMock(EdmProperty.class);
@@ -133,44 +121,34 @@ public class JPAEntityParserTest {
     EdmMapping edmMapping01 = EasyMock.createMock(EdmMapping.class);
 
     try {
-      EasyMock.expect(edmType.getKind())
-          .andStubReturn(EdmTypeKind.SIMPLE);
-      EasyMock.expect(edmType.getName()).andStubThrow(
-          new EdmException(null));
+      EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
+      EasyMock.expect(edmType.getName()).andStubThrow(new EdmException(null));
       EasyMock.replay(edmType);
       EasyMock.expect(edmMapping.getInternalName()).andStubReturn("id");
       EasyMock.replay(edmMapping);
-      EasyMock.expect(edmTyped.getType()).andStubThrow(
-          new EdmException(null));
+      EasyMock.expect(edmTyped.getType()).andStubThrow(new EdmException(null));
       EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
       EasyMock.replay(edmTyped);
-      EasyMock.expect(structuralType.getProperty("identifier"))
-          .andStubReturn(edmTyped);
+      EasyMock.expect(structuralType.getProperty("identifier")).andStubReturn(edmTyped);
 
-      EasyMock.expect(edmType01.getKind()).andStubReturn(
-          EdmTypeKind.SIMPLE);
+      EasyMock.expect(edmType01.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
       EasyMock.expect(edmType01.getName()).andStubReturn("value");
       EasyMock.replay(edmType01);
-      EasyMock.expect(edmMapping01.getInternalName()).andStubReturn(
-          "value");
+      EasyMock.expect(edmMapping01.getInternalName()).andStubReturn("value");
       EasyMock.replay(edmMapping01);
       EasyMock.expect(edmTyped01.getType()).andStubReturn(edmType01);
-      EasyMock.expect(edmTyped01.getMapping())
-          .andStubReturn(edmMapping01);
+      EasyMock.expect(edmTyped01.getMapping()).andStubReturn(edmMapping01);
       EasyMock.replay(edmTyped01);
-      EasyMock.expect(structuralType.getProperty("value")).andStubReturn(
-          edmTyped01);
+      EasyMock.expect(structuralType.getProperty("value")).andStubReturn(edmTyped01);
 
       List<String> propNames = new ArrayList<String>();
       propNames.add("identifier");
       propNames.add("value");
-      EasyMock.expect(structuralType.getPropertyNames()).andReturn(
-          propNames);
+      EasyMock.expect(structuralType.getPropertyNames()).andReturn(propNames);
       EasyMock.replay(structuralType);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2); // assertTrue(false);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2); // assertTrue(false);
     }
 
     try {
@@ -182,8 +160,7 @@ public class JPAEntityParserTest {
   }
 
   @Test
-  public void testparse2EdmPropertyListMap()
-  {
+  public void testparse2EdmPropertyListMap() {
     JPAEntityParser resultParser = JPAEntityParser.create();
     Map<String, Object> edmEntity = new HashMap<String, Object>();
     edmEntity.put("SoId", 1);
@@ -201,8 +178,7 @@ public class JPAEntityParserTest {
       EasyMock.expect(navigationProperty.getMapping()).andStubReturn(edmMapping);
       EasyMock.replay(navigationProperty);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     navigationPropertyList.add(navigationProperty);
@@ -211,14 +187,12 @@ public class JPAEntityParserTest {
       assertEquals(relatedEntity, result.get("RelatedEntities"));
 
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
   @Test
-  public void testparse2EdmPropertyValueMapFromList()
-  {
+  public void testparse2EdmPropertyValueMapFromList() {
     JPAEntityParser resultParser = JPAEntityParser.create();
     demoItem jpaEntity = new demoItem("laptop", 1);
     DemoRelatedEntity relatedEntity = new DemoRelatedEntity("DemoOrder");
@@ -250,8 +224,7 @@ public class JPAEntityParserTest {
       EasyMock.replay(edmProperty2);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     selectPropertyList.add(edmProperty1);
     selectPropertyList.add(edmProperty2);
@@ -259,8 +232,7 @@ public class JPAEntityParserTest {
       Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, selectPropertyList);
       assertEquals("DemoOrder", result.get("Order"));
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -268,8 +240,7 @@ public class JPAEntityParserTest {
   // This unit tests when there is a complex type in the select list
   @SuppressWarnings("unchecked")
   @Test
-  public void testparse2EdmPropertyValueMapFromListComplex()
-  {
+  public void testparse2EdmPropertyValueMapFromListComplex() {
     JPAEntityParser resultParser = JPAEntityParser.create();
     demoItem jpaEntity = new demoItem("laptop", 1);
     DemoRelatedEntity relatedEntity = new DemoRelatedEntity("DemoOrder");
@@ -317,8 +288,7 @@ public class JPAEntityParserTest {
       EasyMock.replay(edmProperty2);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     selectPropertyList.add(edmProperty1);
     selectPropertyList.add(edmProperty2);
@@ -326,8 +296,7 @@ public class JPAEntityParserTest {
       Map<String, Object> result = resultParser.parse2EdmPropertyValueMap(jpaEntity, selectPropertyList);
       assertEquals(1, ((HashMap<String, Object>) result.get("Order")).size());
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -347,29 +316,22 @@ public class JPAEntityParserTest {
        */
       Class<?>[] pars = { String.class, EdmMapping.class, String.class };
       Object[] params = { "Field1", null, "get" };
-      Method getGetterName = resultParser.getClass().getDeclaredMethod(
-          "getAccessModifierName", pars);
+      Method getGetterName = resultParser.getClass().getDeclaredMethod("getAccessModifierName", pars);
       getGetterName.setAccessible(true);
-      String name = (String) getGetterName.invoke(resultParser,
-          params);
+      String name = (String) getGetterName.invoke(resultParser, params);
 
       assertEquals("getField1", name);
 
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InvocationTargetException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchMethodException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
 
     }
   }
@@ -384,29 +346,22 @@ public class JPAEntityParserTest {
        */
       Class<?>[] pars = { String.class, EdmMapping.class, String.class };
       Object[] params = { null, null, null };
-      Method getGetterName = resultParser.getClass().getDeclaredMethod(
-          "getAccessModifierName", pars);
+      Method getGetterName = resultParser.getClass().getDeclaredMethod("getAccessModifierName", pars);
       getGetterName.setAccessible(true);
 
-      String name = (String) getGetterName.invoke(resultParser,
-          params);
+      String name = (String) getGetterName.invoke(resultParser, params);
       assertNull(name);
 
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InvocationTargetException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchMethodException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
 
     }
   }
@@ -429,29 +384,22 @@ public class JPAEntityParserTest {
 
       Class<?>[] pars = { String.class, EdmMapping.class, String.class };
       Object[] params = { "myField", edmMapping, "get" };
-      Method getGetterName = resultParser.getClass().getDeclaredMethod(
-          "getAccessModifierName", pars);
+      Method getGetterName = resultParser.getClass().getDeclaredMethod("getAccessModifierName", pars);
       getGetterName.setAccessible(true);
 
-      String name = (String) getGetterName.invoke(resultParser,
-          params);
+      String name = (String) getGetterName.invoke(resultParser, params);
       assertEquals("getField1", name);
 
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InvocationTargetException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchMethodException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
 
     }
   }
@@ -461,17 +409,13 @@ public class JPAEntityParserTest {
     JPAEntityParser resultParser = JPAEntityParser.create();
     try {
 
-      Method getGetterName = resultParser.getClass().getDeclaredMethod(
-          "getGetterName1", EdmProperty.class);
+      Method getGetterName = resultParser.getClass().getDeclaredMethod("getGetterName1", EdmProperty.class);
       getGetterName.setAccessible(true);
 
     } catch (NoSuchMethodException e) {
-      assertEquals(
-          "org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetterName1(org.apache.olingo.odata2.api.edm.EdmProperty)",
-          e.getMessage());
+      assertEquals("org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetterName1(org.apache.olingo.odata2.api.edm.EdmProperty)", e.getMessage());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
 
     }
   }
@@ -483,8 +427,7 @@ public class JPAEntityParserTest {
     try {
       resultParser.parse2EdmPropertyValueMap(jpaEntity, getEdmPropertyList());
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -492,52 +435,40 @@ public class JPAEntityParserTest {
   public void testGetGetterEdmException() {
     JPAEntityParser resultParser = JPAEntityParser.create();
     Object jpaEntity = new demoItem("abc", 10);
-    EdmStructuralType structuralType = EasyMock
-        .createMock(EdmStructuralType.class);
+    EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
     try {
-      EasyMock.expect(structuralType.getPropertyNames()).andStubThrow(
-          new EdmException(null));
+      EasyMock.expect(structuralType.getPropertyNames()).andStubThrow(new EdmException(null));
       EasyMock.replay(structuralType);
-      Method getGetters = resultParser.getClass().getDeclaredMethod(
-          "getGetters", Object.class, EdmStructuralType.class);
+      Method getGetters = resultParser.getClass().getDeclaredMethod("getGetters", Object.class, EdmStructuralType.class);
       getGetters.setAccessible(true);
       try {
         getGetters.invoke(resultParser, jpaEntity, structuralType);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
         assertTrue(true);
       }
     } catch (NoSuchMethodException e) {
-      assertEquals(
-          "org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetters(java.lang.Object, org.apache.olingo.odata2.api.edm.EdmStructuralType)",
-          e.getMessage());
+      assertEquals("org.apache.olingo.odata2.processor.core.jpa.access.data.JPAEntityParser.getGetters(java.lang.Object, org.apache.olingo.odata2.api.edm.EdmStructuralType)", e.getMessage());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
   @Test
   public void testForNullJPAEntity() {
     JPAEntityParser resultParser = JPAEntityParser.create();
-    EdmStructuralType structuralType = EasyMock
-        .createMock(EdmStructuralType.class);
+    EdmStructuralType structuralType = EasyMock.createMock(EdmStructuralType.class);
     Object map;
     try {
-      map = resultParser.parse2EdmPropertyValueMap(null,
-          structuralType);
+      map = resultParser.parse2EdmPropertyValueMap(null, structuralType);
       assertNull(map);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -577,8 +508,7 @@ public class JPAEntityParserTest {
 
   }
 
-  class DemoRelatedEntity
-  {
+  class DemoRelatedEntity {
     String order;
 
     public String getOrder() {
@@ -602,8 +532,7 @@ public class JPAEntityParserTest {
     return properties;
   }
 
-  class DemoItem2
-  {
+  class DemoItem2 {
     private String field1;
 
     public String getField1() {
@@ -614,8 +543,7 @@ public class JPAEntityParserTest {
       field1 = field;
     }
 
-    public DemoItem2(final String field)
-    {
+    public DemoItem2(final String field) {
       field1 = field;
     }
 
@@ -625,8 +553,7 @@ public class JPAEntityParserTest {
     EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
 
     EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
-    EasyMock.expect(edmMapping.getInternalName()).andStubReturn(
-        "Field1");
+    EasyMock.expect(edmMapping.getInternalName()).andStubReturn("Field1");
     EasyMock.replay(edmMapping);
 
     EdmType edmType = EasyMock.createMock(EdmType.class);
@@ -635,15 +562,13 @@ public class JPAEntityParserTest {
       EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
       EasyMock.expect(edmType.getName()).andStubReturn("identifier");
       EasyMock.expect(edmTyped.getName()).andStubReturn("SalesOrderHeader");
-      EasyMock.expect(edmTyped.getMapping())
-          .andStubReturn(edmMapping);
+      EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
 
       EasyMock.expect(edmTyped.getType()).andStubReturn(edmType);
       EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmType);
     EasyMock.replay(edmTyped);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
index 5c2d59e..656d861 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAContextImplTest.java
@@ -27,16 +27,15 @@ import java.util.Locale;
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
 import org.apache.olingo.odata2.api.processor.ODataContext;
 import org.apache.olingo.odata2.api.processor.ODataProcessor;
 import org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext;
 import org.apache.olingo.odata2.processor.core.jpa.edm.ODataJPAEdmProvider;
 import org.apache.olingo.odata2.processor.core.jpa.mock.ODataJPAContextMock;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class ODataJPAContextImplTest {
 
@@ -74,8 +73,7 @@ public class ODataJPAContextImplTest {
     odataJPAContext.setEntityManagerFactory(emf);
     odataJPAContext.setODataContext(odataContext);
     odataJPAContext.setODataProcessor(processor);
-    odataJPAContext
-        .setPersistenceUnitName(ODataJPAContextMock.PERSISTENCE_UNIT_NAME);
+    odataJPAContext.setPersistenceUnitName(ODataJPAContextMock.PERSISTENCE_UNIT_NAME);
     odataJPAContext.setJPAEdmMappingModel(ODataJPAContextMock.MAPPING_MODEL);
   }
 
@@ -86,8 +84,7 @@ public class ODataJPAContextImplTest {
     assertEquals(odataJPAContext.getEntityManagerFactory().hashCode(), emf.hashCode());
     assertEquals(odataJPAContext.getODataContext().hashCode(), odataContext.hashCode());
     assertEquals(odataJPAContext.getODataProcessor().hashCode(), processor.hashCode());
-    assertEquals(odataJPAContext.getPersistenceUnitName(),
-        ODataJPAContextMock.PERSISTENCE_UNIT_NAME);
+    assertEquals(odataJPAContext.getPersistenceUnitName(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME);
     assertEquals(odataJPAContext.getJPAEdmMappingModel(), ODataJPAContextMock.MAPPING_MODEL);
 
     EntityManager em1 = odataJPAContext.getEntityManager();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
index d9fa5d7..e0e7590 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefaultTest.java
@@ -37,11 +37,6 @@ import javax.persistence.Query;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 
-import org.easymock.EasyMock;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.InlineCount;
 import org.apache.olingo.odata2.api.edm.EdmConcurrencyMode;
@@ -74,6 +69,10 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelExcepti
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.model.JPAEdmTestModelView;
+import org.easymock.EasyMock;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
 
 public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
 
@@ -100,13 +99,11 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
       GetEntityUriInfo getEntityView = getEntityUriInfo();
       Assert.assertNotNull(objODataJPAProcessorDefault.readEntity(getEntityView, HttpContentType.APPLICATION_XML));
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e1) {//Expected
       assertTrue(true);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -115,13 +112,10 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
   public void testcountEntitySet() {
     try {
       Assert.assertNotNull(objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML));
-      Assert.assertEquals(TEXT_PLAIN_CHARSET_UTF_8,
-          objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
+      Assert.assertEquals(TEXT_PLAIN_CHARSET_UTF_8, objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
-    } catch (Exception e)
-    {
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+    } catch (Exception e) {
       assertTrue(true);
     }
   }
@@ -130,13 +124,10 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
   public void testExistsEntity() {
     try {
       Assert.assertNotNull(objODataJPAProcessorDefault.existsEntity(getEntityCountCountUriInfo(), HttpContentType.APPLICATION_XML));
-      Assert.assertEquals(TEXT_PLAIN_CHARSET_UTF_8,
-          objODataJPAProcessorDefault.existsEntity(getEntityCountCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
+      Assert.assertEquals(TEXT_PLAIN_CHARSET_UTF_8, objODataJPAProcessorDefault.existsEntity(getEntityCountCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
-    } catch (Exception e)
-    {
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+    } catch (Exception e) {
       assertTrue(true);
     }
   }
@@ -145,11 +136,9 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
   public void testDeleteEntity() {
     try {
       Assert.assertNotNull(objODataJPAProcessorDefault.deleteEntity(getDeletetUriInfo(), HttpContentType.APPLICATION_XML));
-      Assert.assertEquals(TEXT_PLAIN_CHARSET_UTF_8,
-          objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
+      Assert.assertEquals(TEXT_PLAIN_CHARSET_UTF_8, objODataJPAProcessorDefault.countEntitySet(getEntitySetCountUriInfo(), HttpContentType.APPLICATION_XML).getHeader(STR_CONTENT_TYPE));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -184,27 +173,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
   }
 
   private String getEntityBody() {
-    return
-    "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/\">"
-        + "<content type=\"application/xml\">"
-        + "<m:properties>"
-        + "<d:ID>2</d:ID>"
-        + "<d:CreationDate>2013-01-02T00:00:00</d:CreationDate>"
-        + "<d:CurrencyCode>Code_555</d:CurrencyCode>"
-        + "<d:BuyerAddressInfo m:type=\"SalesOrderProcessing.AddressInfo\">"
-        + "<d:Street>Test_Street_Name_055</d:Street>"
-        + "<d:Number>2</d:Number>"
-        + "<d:Country>Test_Country_2</d:Country>"
-        + "<d:City>Test_City_2</d:City>"
-        + "</d:BuyerAddressInfo>"
-        + "<d:GrossAmount>0.0</d:GrossAmount>"
-        + "<d:BuyerId>2</d:BuyerId>"
-        + "<d:DeliveryStatus>true</d:DeliveryStatus>"
-        + "<d:BuyerName>buyerName_2</d:BuyerName>"
-        + "<d:NetAmount>0.0</d:NetAmount>"
-        + "</m:properties>"
-        + "</content>"
-        + "</entry>";
+    return "<entry xmlns=\"http://www.w3.org/2005/Atom\" xmlns:m=\"http://schemas.microsoft.com/ado/2007/08/dataservices/metadata\" xmlns:d=\"http://schemas.microsoft.com/ado/2007/08/dataservices\" xml:base=\"http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/\">" + "<content type=\"application/xml\">" + "<m:properties>" + "<d:ID>2</d:ID>" + "<d:CreationDate>2013-01-02T00:00:00</d:CreationDate>" + "<d:CurrencyCode>Code_555</d:CurrencyCode>" + "<d:BuyerAddressInfo m:type=\"SalesOrderProcessing.AddressInfo\">" + "<d:Street>Test_Street_Name_055</d:Street>" + "<d:Number>2</d:Number>" + "<d:Country>Test_Country_2</d:Country>" + "<d:City>Test_City_2</d:City>" + "</d:BuyerAddressInfo>" + "<d:GrossAmount>0.0</d:GrossAmount>" + "<d:BuyerId>2</d:BuyerId>" + "<d:DeliveryStatus>true</d:DeliveryStatus>" + "<d:BuyerName>buyerName_2</d:BuyerName>" + "<d:NetAmount>0.0</d:NetAmount>" + "</m:properties>" + "</content>" + "</entry>";
   }
 
   private GetEntitySetCountUriInfo getEntitySetCountUriInfo() {
@@ -265,8 +234,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
       EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(getLocalEdmEntityType());
       EasyMock.replay(edmEntitySet);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return edmEntitySet;
   }
@@ -290,8 +258,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
       EasyMock.expect(edmEntityType.getMapping()).andStubReturn(getEdmMappingMockedObj(SALES_ORDER));// ID vs Salesorder ID
       EasyMock.replay(edmEntityType);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return edmEntityType;
   }
@@ -399,8 +366,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
     @Override
     public boolean equals(final Object obj) {
       boolean isEqual = false;
-      if (obj instanceof Address)
-      {
+      if (obj instanceof Address) {
         isEqual = getSoId().equalsIgnoreCase(((Address) obj).getSoId());//
       }
       return isEqual;
@@ -430,21 +396,17 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
   }
 
   private GetEntityUriInfo getEntityUriInfo() {
-    GetEntityUriInfo getEntityView = EasyMock
-        .createMock(GetEntityUriInfo.class);
+    GetEntityUriInfo getEntityView = EasyMock.createMock(GetEntityUriInfo.class);
     EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
     try {
       EasyMock.expect(getEntityView.getExpand()).andStubReturn(null);
-      EasyMock.expect(edmEntityType.getKeyProperties()).andStubReturn(
-          new ArrayList<EdmProperty>());
-      EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(
-          edmEntityType);
+      EasyMock.expect(edmEntityType.getKeyProperties()).andStubReturn(new ArrayList<EdmProperty>());
+      EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
       EasyMock.expect(edmEntitySet.getName()).andStubReturn(SALES_ORDER_HEADERS);
 
       EasyMock.expect(getEntityView.getSelect()).andStubReturn(null);
-      EasyMock.expect(getEntityView.getTargetEntitySet()).andStubReturn(
-          edmEntitySet);
+      EasyMock.expect(getEntityView.getTargetEntitySet()).andStubReturn(edmEntitySet);
       EasyMock.expect(edmEntityType.getPropertyNames()).andStubReturn(getLocalPropertyNames());
       EasyMock.expect(edmEntityType.getProperty(SO_ID)).andStubReturn(getEdmTypedMockedObj(SO_ID));
 
@@ -460,17 +422,14 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
       EasyMock.expect(edmEntitySet.getEntityContainer()).andStubReturn(getLocalEdmEntityContainer());
 
       EasyMock.replay(edmEntityType, edmEntitySet);
-      EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(
-          new ArrayList<KeyPredicate>());
+      EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(new ArrayList<KeyPredicate>());
       List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
-      EasyMock.expect(getEntityView.getNavigationSegments()).andReturn(
-          navigationSegments);
+      EasyMock.expect(getEntityView.getNavigationSegments()).andReturn(navigationSegments);
       EasyMock.expect(getEntityView.getStartEntitySet()).andReturn(edmEntitySet);
 
       EasyMock.replay(getEntityView);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return getEntityView;
   }
@@ -481,8 +440,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
     try {
       EasyMock.expect(edmEntityContainer.getName()).andStubReturn(SALESORDERPROCESSING_CONTAINER);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     EasyMock.replay(edmEntityContainer);
@@ -492,8 +450,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
   private EdmTyped getEdmTypedMockedObj(final String propertyName) {
     EdmProperty mockedEdmProperty = EasyMock.createMock(EdmProperty.class);
     try {
-      EasyMock.expect(mockedEdmProperty.getMapping())
-          .andStubReturn(getEdmMappingMockedObj(propertyName));
+      EasyMock.expect(mockedEdmProperty.getMapping()).andStubReturn(getEdmMappingMockedObj(propertyName));
       EdmType edmType = EasyMock.createMock(EdmType.class);
       EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
       EasyMock.replay(edmType);
@@ -503,8 +460,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
 
       EasyMock.replay(mockedEdmProperty);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return mockedEdmProperty;
   }
@@ -520,11 +476,9 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
   private EdmMapping getEdmMappingMockedObj(final String propertyName) {
     EdmMapping mockedEdmMapping = EasyMock.createMock(EdmMapping.class);
     if (propertyName.equalsIgnoreCase(SALES_ORDER)) {
-      EasyMock.expect(mockedEdmMapping.getInternalName())
-          .andStubReturn(SALES_ORDER_HEADERS);
+      EasyMock.expect(mockedEdmMapping.getInternalName()).andStubReturn(SALES_ORDER_HEADERS);
     } else {
-      EasyMock.expect(mockedEdmMapping.getInternalName())
-          .andStubReturn(propertyName);
+      EasyMock.expect(mockedEdmMapping.getInternalName()).andStubReturn(propertyName);
     }
     EasyMock.replay(mockedEdmMapping);
     return mockedEdmMapping;
@@ -541,8 +495,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
     try {
       EasyMock.expect(objODataContext.getPathInfo()).andStubReturn(getLocalPathInfo());
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(objODataContext);
     return objODataContext;
@@ -560,8 +513,7 @@ public class ODataJPAProcessorDefaultTest extends JPAEdmTestModelView {
     try {
       uri = new URI(STR_LOCAL_URI);
     } catch (URISyntaxException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return uri;
   }


[11/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
index 7786c58..203344b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
@@ -30,13 +30,11 @@ import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
  */
 public class FilterParserImplTool extends FilterParserImpl {
 
-  public FilterParserImplTool(final EdmEntityType resourceEntityType)
-  {
+  public FilterParserImplTool(final EdmEntityType resourceEntityType) {
     super(resourceEntityType);
   }
 
-  public void addTestfunctions()
-  {
+  public void addTestfunctions() {
     Map<String, InfoMethod> lAvailableMethods = new HashMap<String, InfoMethod>(availableMethods);
     ParameterSetCombination combination = null;
     //create type helpers

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
index 5cc94b0..7274a6c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
@@ -23,10 +23,6 @@ import static org.junit.Assert.assertNotNull;
 
 import java.util.List;
 
-import org.junit.Test;
-
-import com.google.gson.Gson;
-import com.google.gson.internal.StringMap;
 import org.apache.olingo.odata2.api.exception.ODataApplicationException;
 import org.apache.olingo.odata2.api.uri.UriParser;
 import org.apache.olingo.odata2.api.uri.expression.ExceptionVisitExpression;
@@ -34,6 +30,10 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionKind;
 import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
 import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
 import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
+import org.junit.Test;
+
+import com.google.gson.Gson;
+import com.google.gson.internal.StringMap;
 
 /**
  *  

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
index 044d6d8..0600f64 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
@@ -24,10 +24,6 @@ import static org.junit.Assert.fail;
 import java.util.Locale;
 
 import org.apache.log4j.xml.DOMConfigurator;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
 import org.apache.olingo.odata2.api.edm.EdmProperty;
@@ -43,6 +39,9 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor;
 import org.apache.olingo.odata2.api.uri.expression.SortOrder;
 import org.apache.olingo.odata2.core.exception.MessageService;
 import org.apache.olingo.odata2.core.exception.MessageService.Message;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  *  
@@ -384,8 +383,7 @@ public class ParserTool {
   public ParserTool aExpr() {
     String info = "GetExpr(" + expression + ")-->";
 
-    if ((curNode.getKind() != ExpressionKind.ORDER)
-        && (curNode.getKind() != ExpressionKind.FILTER)) {
+    if ((curNode.getKind() != ExpressionKind.ORDER) && (curNode.getKind() != ExpressionKind.FILTER)) {
       String out = info + "Expected: " + ExpressionKind.ORDER + " or " + ExpressionKind.FILTER + " Actual: " + curNode.getKind().toString();
       dout("  " + out);
       fail(out);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
index 4eb2d61..7df85c6 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
@@ -18,8 +18,6 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.core.uri.expression;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.core.edm.Bit;
 import org.apache.olingo.odata2.core.edm.EdmBinary;
 import org.apache.olingo.odata2.core.edm.EdmBoolean;
@@ -38,6 +36,7 @@ import org.apache.olingo.odata2.core.edm.EdmSingle;
 import org.apache.olingo.odata2.core.edm.EdmString;
 import org.apache.olingo.odata2.core.edm.EdmTime;
 import org.apache.olingo.odata2.core.edm.Uint7;
+import org.junit.Test;
 
 /**
  *  
@@ -371,22 +370,19 @@ public class TestAbapCompatibility extends TestBase {
     //iv_expression = `concat('a' 'b')`
     //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_invalid_parameter
     //iv_expected_msg    = 'Invalid parameter for function ''concat'''  ).
-    GetPTF("concat('a' 'b')")
-        .aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
+    GetPTF("concat('a' 'b')").aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
 
     //lcl_helper=>veri_expression_ex(
     //iv_expression = `concat('125')`
     //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_few_parameter
     //iv_expected_msg    = 'Too few parameters for function ''concat'''  ).
-    GetPTF("concat('125')")
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
+    GetPTF("concat('125')").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('125')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
 
     //lcl_helper=>veri_expression_ex(
     //iv_expression = `indexof('a','b','c')`
     //iv_expected_textid = /iwcor/cx_ds_expr_syntax_error=>function_to_many_parameter
     //iv_expected_msg    = 'Too many parameters for function ''indexof'''  ).
-    GetPTF("indexof('a','b','c')")
-        .aExMsgText("No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
+    GetPTF("indexof('a','b','c')").aExMsgText("No applicable method found for \"indexof\" at position 1 in \"indexof('a','b','c')\" with the specified arguments. Method \"indexof\" requires exact 2 argument(s).");
 
     //lcl_helper=>veri_expression_ex(
     //iv_expression = `replace('aBa','B','CCC')`
@@ -406,8 +402,7 @@ public class TestAbapCompatibility extends TestBase {
 
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=replace('aBa','B','CCC')
     //-->Unknown function 'replace' at position 0.
-    GetPTF("replace('aBa','B','CCC')")
-        .aExMsgText("Unknown function \"replace\" at position 1 in \"replace('aBa','B','CCC')\".");
+    GetPTF("replace('aBa','B','CCC')").aExMsgText("Unknown function \"replace\" at position 1 in \"replace('aBa','B','CCC')\".");
 
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
index 2c1cec8..c3d4ce9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
@@ -49,8 +49,7 @@ public class TestBase {
   }
 
   static public ParserTool GetPTF(final EdmEntityType resourceEntityType, final String expression) {
-    return new ParserTool(expression, false, true, false,
-        resourceEntityType);
+    return new ParserTool(expression, false, true, false, resourceEntityType);
   }
 
   static public ParserTool GetPTO(final String expression) {
@@ -66,8 +65,7 @@ public class TestBase {
   }
 
   static public ParserTool GetPTF_noTEST(final EdmEntityType resourceEntityType, final String expression) {
-    return new ParserTool(expression, false, false, true,
-        resourceEntityType);
+    return new ParserTool(expression, false, false, true, resourceEntityType);
   }
 
   static public ParserTool GetPTO_noTEST(final String expression) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
index 2621fa6..b4a27a0 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
@@ -18,11 +18,10 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.core.uri.expression;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.uri.expression.ExceptionVisitExpression;
 import org.apache.olingo.odata2.api.uri.expression.ExpressionParserException;
 import org.apache.olingo.odata2.testutil.helper.ODataMessageTextVerifier;
+import org.junit.Test;
 
 /**
  *  

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
index a920f1c..bb335f7 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
@@ -24,8 +24,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmComplexType;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -52,6 +50,7 @@ import org.apache.olingo.odata2.core.edm.EdmString;
 import org.apache.olingo.odata2.core.edm.EdmTime;
 import org.apache.olingo.odata2.core.edm.Uint7;
 import org.apache.olingo.odata2.core.edm.provider.EdmComplexPropertyImplProv;
+import org.junit.Test;
 
 /**
  *  
@@ -85,10 +84,7 @@ public class TestParser extends TestBase {
     GetPTO("sven desc, test desc").aSerialized("{oc({o(sven, desc)},{o(test, desc)})}");
 
     GetPTO("'sven', 77").order(1).aSortOrder(SortOrder.asc);
-    GetPTO("'sven', 77 desc")
-        .root().order(0).aSortOrder(SortOrder.asc).aExpr().aEdmType(EdmString.getInstance())
-        .root().order(1).aSortOrder(SortOrder.desc).aExpr()
-        .aEdmType(Uint7.getInstance());
+    GetPTO("'sven', 77 desc").root().order(0).aSortOrder(SortOrder.asc).aExpr().aEdmType(EdmString.getInstance()).root().order(1).aSortOrder(SortOrder.desc).aExpr().aEdmType(Uint7.getInstance());
 
   }
 
@@ -133,21 +129,13 @@ public class TestParser extends TestBase {
   @Test
   public void testProperties() {
     // GetPTF("sven").aSerialized("sven").aKind(ExpressionKind.PROPERTY);
-    GetPTF("sven1 add sven2").aSerialized("{sven1 add sven2}")
-        .aKind(ExpressionKind.BINARY)
-        .root().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven1")
-        .root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven2");
+    GetPTF("sven1 add sven2").aSerialized("{sven1 add sven2}").aKind(ExpressionKind.BINARY).root().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven1").root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("sven2");
   }
 
   @Test
   public void testDeepProperties() {
     GetPTF("a/b").aSerialized("{a/b}").aKind(ExpressionKind.MEMBER);
-    GetPTF("a/b/c").aSerialized("{{a/b}/c}")
-        .root().aKind(ExpressionKind.MEMBER)
-        .root().left().aKind(ExpressionKind.MEMBER)
-        .root().left().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("a")
-        .root().left().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("b")
-        .root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("c");
+    GetPTF("a/b/c").aSerialized("{{a/b}/c}").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aUriLiteral("a").root().left().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("b").root().right().aKind(ExpressionKind.PROPERTY).aUriLiteral("c");
   }
 
   @Test
@@ -167,29 +155,16 @@ public class TestParser extends TestBase {
 
       GetPTF(edmEtAllTypes, "String").aEdmProperty(string).aEdmType(stringType);
 
-      GetPTF(edmEtAllTypes, "'text' eq String")
-          .root().aKind(ExpressionKind.BINARY);
+      GetPTF(edmEtAllTypes, "'text' eq String").root().aKind(ExpressionKind.BINARY);
 
-      GetPTF(edmEtAllTypes, "Complex/String")
-          .root().left().aEdmProperty(complex).aEdmType(complexType)
-          .root().right().aEdmProperty(complexString).aEdmType(complexStringType)
-          .root().aKind(ExpressionKind.MEMBER).aEdmType(complexStringType);
+      GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right().aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(complexStringType);
 
-      GetPTF(edmEtAllTypes, "Complex/Address/City")
-          .root().aKind(ExpressionKind.MEMBER)
-          .root().left().aKind(ExpressionKind.MEMBER)
-          .root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(complexType)
-          .root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(complexAddressType)
-          .root().left().aEdmType(complexAddressType)
-          .root().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType)
-          .root().aEdmType(complexAddressCityType);
+      GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
 
       EdmProperty boolean_ = (EdmProperty) edmEtAllTypes.getProperty("Boolean");
       EdmSimpleType boolean_Type = (EdmSimpleType) boolean_.getType();
 
-      GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY)
-          .aEdmType(boolean_Type).right().aEdmProperty(boolean_)
-          .aEdmType(boolean_Type);
+      GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(boolean_).aEdmType(boolean_Type);
 
     } catch (EdmException e) {
       fail("Error in testPropertiesWithEdm:" + e.getLocalizedMessage());
@@ -220,10 +195,7 @@ public class TestParser extends TestBase {
     GetPTF("1d add 2d").aSerialized("{1d add 2d}");
     GetPTF("1d div 2d").aSerialized("{1d div 2d}");
 
-    GetPTF("1d add 2d").aSerialized("{1d add 2d}")
-        .aKind(ExpressionKind.BINARY)
-        .root().left().aKind(ExpressionKind.LITERAL)
-        .root().right().aKind(ExpressionKind.LITERAL);
+    GetPTF("1d add 2d").aSerialized("{1d add 2d}").aKind(ExpressionKind.BINARY).root().left().aKind(ExpressionKind.LITERAL).root().right().aKind(ExpressionKind.LITERAL);
 
   }
 
@@ -359,86 +331,51 @@ public class TestParser extends TestBase {
     EdmString stringInst = EdmString.getInstance();
     EdmTime timeInst = EdmTime.getInstance();
 
-    GetPTF("X'Fa12aAA1'").aUriLiteral("X'Fa12aAA1'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(binaryInst);
-    GetPTF("binary'FA12AAA1'").aUriLiteral("binary'FA12AAA1'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(binaryInst);
-
-    GetPTF("true").aUriLiteral("true").aKind(ExpressionKind.LITERAL)
-        .aEdmType(boolInst);
-    GetPTF("false").aUriLiteral("false").aKind(ExpressionKind.LITERAL)
-        .aEdmType(boolInst);
-
-    GetPTF("1").aUriLiteral("1").aKind(ExpressionKind.LITERAL)
-        .aEdmType(bitInst);
-    GetPTF("0").aUriLiteral("0").aKind(ExpressionKind.LITERAL)
-        .aEdmType(bitInst);
-
-    GetPTF("255").aUriLiteral("255").aKind(ExpressionKind.LITERAL)
-        .aEdmType(byteInst);
-
-    GetPTF("123").aUriLiteral("123").aKind(ExpressionKind.LITERAL)
-        .aEdmType(Uint7Inst);
-
-    GetPTF("datetime'2009-12-26T21:23:38'")
-        .aUriLiteral("datetime'2009-12-26T21:23:38'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
-    GetPTF("datetime'2009-12-26T21:23:38'")
-        .aUriLiteral("datetime'2009-12-26T21:23:38'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
-
-    GetPTF("datetimeoffset'2009-12-26T21:23:38Z'")
-        .aUriLiteral("datetimeoffset'2009-12-26T21:23:38Z'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
-    GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'")
-        .aUriLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
-
-    GetPTF("4.5m").aUriLiteral("4.5m").aKind(ExpressionKind.LITERAL)
-        .aEdmType(decimalInst);
-    GetPTF("4.5M").aUriLiteral("4.5M").aKind(ExpressionKind.LITERAL)
-        .aEdmType(decimalInst);
-
-    GetPTF("4.5d").aUriLiteral("4.5d").aKind(ExpressionKind.LITERAL)
-        .aEdmType(doubleInst);
-    GetPTF("4.5D").aUriLiteral("4.5D").aKind(ExpressionKind.LITERAL)
-        .aEdmType(doubleInst);
-
-    GetPTF("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'")
-        .aUriLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(guidInst);
-
-    GetPTF("-32768").aUriLiteral("-32768").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int16Inst);
-    GetPTF("3276").aUriLiteral("3276").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int16Inst);
-    GetPTF("32767").aUriLiteral("32767").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int16Inst);
-
-    GetPTF("-327687").aUriLiteral("-327687").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int32Inst);
-    GetPTF("32768").aUriLiteral("32768").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int32Inst);
-    GetPTF("327686").aUriLiteral("327686").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int32Inst);
-
-    GetPTF("64L").aUriLiteral("64L").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int64Inst);
-    GetPTF("64l").aUriLiteral("64l").aKind(ExpressionKind.LITERAL)
-        .aEdmType(int64Inst);
-
-    GetPTF("-123").aUriLiteral("-123").aKind(ExpressionKind.LITERAL)
-        .aEdmType(intSByte);
-    GetPTF("-128").aUriLiteral("-128").aKind(ExpressionKind.LITERAL)
-        .aEdmType(intSByte);
-
-    GetPTF("4.5f").aUriLiteral("4.5f").aKind(ExpressionKind.LITERAL)
-        .aEdmType(singleInst);
-
-    GetPTF("'abc'").aUriLiteral("'abc'").aKind(ExpressionKind.LITERAL)
-        .aEdmType(stringInst);
-    GetPTF("time'PT120S'").aUriLiteral("time'PT120S'")
-        .aKind(ExpressionKind.LITERAL).aEdmType(timeInst);
+    GetPTF("X'Fa12aAA1'").aUriLiteral("X'Fa12aAA1'").aKind(ExpressionKind.LITERAL).aEdmType(binaryInst);
+    GetPTF("binary'FA12AAA1'").aUriLiteral("binary'FA12AAA1'").aKind(ExpressionKind.LITERAL).aEdmType(binaryInst);
+
+    GetPTF("true").aUriLiteral("true").aKind(ExpressionKind.LITERAL).aEdmType(boolInst);
+    GetPTF("false").aUriLiteral("false").aKind(ExpressionKind.LITERAL).aEdmType(boolInst);
+
+    GetPTF("1").aUriLiteral("1").aKind(ExpressionKind.LITERAL).aEdmType(bitInst);
+    GetPTF("0").aUriLiteral("0").aKind(ExpressionKind.LITERAL).aEdmType(bitInst);
+
+    GetPTF("255").aUriLiteral("255").aKind(ExpressionKind.LITERAL).aEdmType(byteInst);
+
+    GetPTF("123").aUriLiteral("123").aKind(ExpressionKind.LITERAL).aEdmType(Uint7Inst);
+
+    GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
+    GetPTF("datetime'2009-12-26T21:23:38'").aUriLiteral("datetime'2009-12-26T21:23:38'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeInst);
+
+    GetPTF("datetimeoffset'2009-12-26T21:23:38Z'").aUriLiteral("datetimeoffset'2009-12-26T21:23:38Z'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
+    GetPTF("datetimeoffset'2002-10-10T12:00:00-05:00'").aUriLiteral("datetimeoffset'2002-10-10T12:00:00-05:00'").aKind(ExpressionKind.LITERAL).aEdmType(datetimeOffsetInst);
+
+    GetPTF("4.5m").aUriLiteral("4.5m").aKind(ExpressionKind.LITERAL).aEdmType(decimalInst);
+    GetPTF("4.5M").aUriLiteral("4.5M").aKind(ExpressionKind.LITERAL).aEdmType(decimalInst);
+
+    GetPTF("4.5d").aUriLiteral("4.5d").aKind(ExpressionKind.LITERAL).aEdmType(doubleInst);
+    GetPTF("4.5D").aUriLiteral("4.5D").aKind(ExpressionKind.LITERAL).aEdmType(doubleInst);
+
+    GetPTF("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aUriLiteral("guid'1225c695-cfb8-4ebb-aaaa-80da344efa6a'").aKind(ExpressionKind.LITERAL).aEdmType(guidInst);
+
+    GetPTF("-32768").aUriLiteral("-32768").aKind(ExpressionKind.LITERAL).aEdmType(int16Inst);
+    GetPTF("3276").aUriLiteral("3276").aKind(ExpressionKind.LITERAL).aEdmType(int16Inst);
+    GetPTF("32767").aUriLiteral("32767").aKind(ExpressionKind.LITERAL).aEdmType(int16Inst);
+
+    GetPTF("-327687").aUriLiteral("-327687").aKind(ExpressionKind.LITERAL).aEdmType(int32Inst);
+    GetPTF("32768").aUriLiteral("32768").aKind(ExpressionKind.LITERAL).aEdmType(int32Inst);
+    GetPTF("327686").aUriLiteral("327686").aKind(ExpressionKind.LITERAL).aEdmType(int32Inst);
+
+    GetPTF("64L").aUriLiteral("64L").aKind(ExpressionKind.LITERAL).aEdmType(int64Inst);
+    GetPTF("64l").aUriLiteral("64l").aKind(ExpressionKind.LITERAL).aEdmType(int64Inst);
+
+    GetPTF("-123").aUriLiteral("-123").aKind(ExpressionKind.LITERAL).aEdmType(intSByte);
+    GetPTF("-128").aUriLiteral("-128").aKind(ExpressionKind.LITERAL).aEdmType(intSByte);
+
+    GetPTF("4.5f").aUriLiteral("4.5f").aKind(ExpressionKind.LITERAL).aEdmType(singleInst);
+
+    GetPTF("'abc'").aUriLiteral("'abc'").aKind(ExpressionKind.LITERAL).aEdmType(stringInst);
+    GetPTF("time'PT120S'").aUriLiteral("time'PT120S'").aKind(ExpressionKind.LITERAL).aEdmType(timeInst);
 
     // The EdmSimpleTypeSamples contains a well formatted list of all
     // possible
@@ -456,10 +393,8 @@ public class TestParser extends TestBase {
   }
 
   ExpressionParserException GetException() {
-    ExpressionParserException ex = new ExpressionParserException(
-        ExpressionParserException.COMMON_ERROR);
-    List<StackTraceElement> stack = new ArrayList<StackTraceElement>(
-        Arrays.asList(ex.getStackTrace()));
+    ExpressionParserException ex = new ExpressionParserException(ExpressionParserException.COMMON_ERROR);
+    List<StackTraceElement> stack = new ArrayList<StackTraceElement>(Arrays.asList(ex.getStackTrace()));
     stack.remove(0);
     ex.setStackTrace(stack.toArray(new StackTraceElement[stack.size()]));
     return ex;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
index 49e2b72..edf2550 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
@@ -18,11 +18,10 @@
  ******************************************************************************/
 package org.apache.olingo.odata2.core.uri.expression;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.uri.expression.ExpressionKind;
 import org.apache.olingo.odata2.api.uri.expression.ExpressionParserException;
+import org.junit.Test;
 
 /**
  *  
@@ -30,111 +29,91 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionParserException;
 public class TestParserExceptions extends TestBase {
 
   @Test
-  public void testOPMparseOrderByString()
-  {
+  public void testOPMparseOrderByString() {
     EdmEntityType edmEtAllTypes = edmInfo.getTypeEtAllTypes();
 
     //CASE 1
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20ascc
     //-->Syntax error at position 10.
-    GetPTO(edmEtAllTypes, "String ascc")
-        .aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String ascc\".");
+    GetPTO(edmEtAllTypes, "String ascc").aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String ascc\".");
 
     //CASE 2
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20asc,
     //-->Expression expected at position 12.
-    GetPTO(edmEtAllTypes, "String asc,")
-        .aExMsgText("Expression expected after position 11 in \"String asc,\".");
+    GetPTO(edmEtAllTypes, "String asc,").aExMsgText("Expression expected after position 11 in \"String asc,\".");
 
     //CASE 3
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice%20asc%20d
     //-->Syntax error at position 14.
-    GetPTO(edmEtAllTypes, "String asc a")
-        .aExMsgText("Comma or end of expression expected at position 12 in \"String asc a\".");
+    GetPTO(edmEtAllTypes, "String asc a").aExMsgText("Comma or end of expression expected at position 12 in \"String asc a\".");
 
     //CASE 4
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice b
     //-->Syntax error at position 10.
-    GetPTO(edmEtAllTypes, "String b")
-        .aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String b\".");
+    GetPTO(edmEtAllTypes, "String b").aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String b\".");
 
     //CASE 5
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice, UnitPrice b
     //-->Syntax error at position 21.
-    GetPTO(edmEtAllTypes, "String, String b")
-        .aExMsgText("Invalid sort order in OData orderby parser at position 16 in \"String, String b\".");
+    GetPTO(edmEtAllTypes, "String, String b").aExMsgText("Invalid sort order in OData orderby parser at position 16 in \"String, String b\".");
 
     //CASE 6
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice a, UnitPrice desc
     //-->Syntax error at position 10.
-    GetPTO(edmEtAllTypes, "String a, String desc")
-        .aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String a, String desc\".");
+    GetPTO(edmEtAllTypes, "String a, String desc").aExMsgText("Invalid sort order in OData orderby parser at position 8 in \"String a, String desc\".");
 
     //CASE 7
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$orderby=UnitPrice asc, UnitPrice b
     //-->Syntax error at position 25.
-    GetPTO(edmEtAllTypes, "String asc, String b")
-        .aExMsgText("Invalid sort order in OData orderby parser at position 20 in \"String asc, String b\".");
+    GetPTO(edmEtAllTypes, "String asc, String b").aExMsgText("Invalid sort order in OData orderby parser at position 20 in \"String asc, String b\".");
 
   }
 
   @Test
-  public void testPMvalidateEdmProperty()
-  {
+  public void testPMvalidateEdmProperty() {
     EdmEntityType edmEtAllTypes = edmInfo.getTypeEtAllTypes();
 
     //OK
-    GetPTF(edmEtAllTypes, "'text' eq String")
-        .aKind(ExpressionKind.BINARY)
-        .aSerialized("{'text' eq String}");
+    GetPTF(edmEtAllTypes, "'text' eq String").aKind(ExpressionKind.BINARY).aSerialized("{'text' eq String}");
 
     //CASE 1
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=NotAProperty
     //-->No property 'NotAProperty' exists in type 'ODataWeb.Northwind.Model.Product' at position 10.
-    GetPTF(edmEtAllTypes, "NotAProperty")
-        .aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at position 1 in \"NotAProperty\".");
+    GetPTF(edmEtAllTypes, "NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at position 1 in \"NotAProperty\".");
 
     //CASE 2
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='text'%20eq%20NotAProperty
     //-->No property 'NotAProperty' exists in type 'ODataWeb.Northwind.Model.Product' at position 10.
-    GetPTF(edmEtAllTypes, "'text' eq NotAProperty")
-        .aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at position 11 in \"'text' eq NotAProperty\".");
+    GetPTF(edmEtAllTypes, "'text' eq NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.EtAllTypes\" at position 11 in \"'text' eq NotAProperty\".");
 
     //CASE 3
-    GetPTF(edmEtAllTypes, "Complex/NotAProperty")
-        .aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at position 9 in \"Complex/NotAProperty\".");
+    GetPTF(edmEtAllTypes, "Complex/NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at position 9 in \"Complex/NotAProperty\".");
 
     //CASE 4
-    GetPTF(edmEtAllTypes, "'text' eq Complex/NotAProperty")
-        .aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at position 19 in \"'text' eq Complex/NotAProperty\".");
+    GetPTF(edmEtAllTypes, "'text' eq Complex/NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"TecRefScenario.CtAllTypes\" at position 19 in \"'text' eq Complex/NotAProperty\".");
 
     //CASE 5
-    GetPTF(edmEtAllTypes, "String/NotAProperty")
-        .aExMsgText("No property \"NotAProperty\" exists in type \"Edm.String\" at position 8 in \"String/NotAProperty\".");
+    GetPTF(edmEtAllTypes, "String/NotAProperty").aExMsgText("No property \"NotAProperty\" exists in type \"Edm.String\" at position 8 in \"String/NotAProperty\".");
 
     //CASE 6
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='aText'/NotAProperty
     //-->Exception Stack
-    GetPTF(edmEtAllTypes, "'aText'/NotAProperty")
-        .aExMsgText("Leftside of method operator at position 8 is not a property in \"'aText'/NotAProperty\".");
+    GetPTF(edmEtAllTypes, "'aText'/NotAProperty").aExMsgText("Leftside of method operator at position 8 is not a property in \"'aText'/NotAProperty\".");
 
     //CASE 7
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='Hong Kong' eq ProductName/city
     //--> No property 'city' exists in type 'System.String' at position 27. 
-    GetPTF(edmEtAllTypes, "'Hong Kong' eq DateTime/city")
-        .aExMsgText("No property \"city\" exists in type \"Edm.DateTime\" at position 25 in \"'Hong Kong' eq DateTime/city\".");
+    GetPTF(edmEtAllTypes, "'Hong Kong' eq DateTime/city").aExMsgText("No property \"city\" exists in type \"Edm.DateTime\" at position 25 in \"'Hong Kong' eq DateTime/city\".");
 
     //CASE 8
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter='Hong Kong' eq ProductName/city
     //--> No property 'city' exists in type 'System.String' at position 27. 
-    GetPTF(edmEtAllTypes, "'Hong Kong' eq String/city")
-        .aExMsgText("No property \"city\" exists in type \"Edm.String\" at position 23 in \"'Hong Kong' eq String/city\".");
+    GetPTF(edmEtAllTypes, "'Hong Kong' eq String/city").aExMsgText("No property \"city\" exists in type \"Edm.String\" at position 23 in \"'Hong Kong' eq String/city\".");
 
   }
 
   @Test
-  public void testPMreadParameters()
-  {
+  public void testPMreadParameters() {
 
     //OK
     GetPTF("concat('A','B')").aSerialized("{concat('A','B')}");
@@ -142,14 +121,12 @@ public class TestParserExceptions extends TestBase {
     //CASE 12
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith()
     //-->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions considered are: startswith(System.String, System.String).
-    GetPTF("startswith()").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith()\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
+    GetPTF("startswith()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith()\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
 
     //CASE 13
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A')
     //-->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions considered are: startswith(System.String, System.String).
-    GetPTF("startswith('A')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith('A')\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
+    GetPTF("startswith('A')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith('A')\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
 
     //CASE 14
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A','B')
@@ -159,50 +136,40 @@ public class TestParserExceptions extends TestBase {
     //CASE 15
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=startswith('A','B','C')
     //-->No applicable function found for 'startswith' at position 0 with the specified arguments. The functions considered are: startswith(System.String, System.String).
-    GetPTF("startswith('A','B','C')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith('A','B','C')\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
+    GetPTF("startswith('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"startswith\" at position 1 in \"startswith('A','B','C')\" with the specified arguments. Method \"startswith\" requires exact 2 argument(s).");
 
     //CASE 16
-    GetPTF("concat()")
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat()\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
+    GetPTF("concat()").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat()\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
     //CASE 17
-    GetPTF("concat('A')")
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
+    GetPTF("concat('A')").aExMsgText("No applicable method found for \"concat\" at position 1 in \"concat('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
     //CASE 18
-    GetPTF("concat('A','B')")
-        .aSerialized("{concat('A','B')}");
+    GetPTF("concat('A','B')").aSerialized("{concat('A','B')}");
     //CASE 19
-    GetPTF("concat('A','B','C')")
-        .aSerialized("{concat('A','B','C')}");
+    GetPTF("concat('A','B','C')").aSerialized("{concat('A','B','C')}");
 
     //CASE 20
-    GetPTF("'A' and concat('A')")
-        .aExMsgText("No applicable method found for \"concat\" at position 9 in \"'A' and concat('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
+    GetPTF("'A' and concat('A')").aExMsgText("No applicable method found for \"concat\" at position 9 in \"'A' and concat('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
 
     //CASE 1
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(
     //-->Expression expected at position 7.
-    GetPTF("concat(").aExType(ExpressionParserException.class)
-        .aExMsgText("Expression expected after position 7 in \"concat(\".");
+    GetPTF("concat(").aExType(ExpressionParserException.class).aExMsgText("Expression expected after position 7 in \"concat(\".");
 
     //CASE 2
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(123
     //-->')' or ',' expected at position 10.
-    GetPTF("concat(123").aExType(ExpressionParserException.class)
-        .aExMsgText("\")\" or \",\" expected after position 10 in \"concat(123\".");
+    GetPTF("concat(123").aExType(ExpressionParserException.class).aExMsgText("\")\" or \",\" expected after position 10 in \"concat(123\".");
     //.aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 7 in \"concat(\".");
 
     //CASE 3 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(,
     //Expression expected at position 7.
-    GetPTF("concat(,").aExType(ExpressionParserException.class)
-        .aExMsgText("Expression expected at position 8 in \"concat(,\".");
+    GetPTF("concat(,").aExType(ExpressionParserException.class).aExMsgText("Expression expected at position 8 in \"concat(,\".");
 
     //CASE 4
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat(123,
     //-->Expression expected at position 11.
-    GetPTF("concat(123,").aExType(ExpressionParserException.class)
-        .aExMsgText("Expression expected after position 11 in \"concat(123,\".");
+    GetPTF("concat(123,").aExType(ExpressionParserException.class).aExMsgText("Expression expected after position 11 in \"concat(123,\".");
 
     //CASE 5
     //min = -1, max = -1, 
@@ -220,70 +187,55 @@ public class TestParserExceptions extends TestBase {
 
     //CASE 7
     //min = 2, max = -1, 
-    GetPTF("testingMINMAX3()").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX3()\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
-    GetPTF("testingMINMAX3('A')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX3('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
+    GetPTF("testingMINMAX3()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX3()\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
+    GetPTF("testingMINMAX3('A')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX3('A')\" with the specified arguments. Method \"concat\" requires 2 or more arguments.");
     GetPTF("testingMINMAX3('A','B')").aSerialized("{concat('A','B')}");
     GetPTF("testingMINMAX3('A','B','C')").aSerialized("{concat('A','B','C')}");
 
     //CASE 8
     //min =-1, max = 0, 
     GetPTF("testingMINMAX4()").aSerialized("{concat()}");
-    GetPTF("testingMINMAX4('A')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
-    GetPTF("testingMINMAX4('A','B')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
-    GetPTF("testingMINMAX4('A','B','C')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B','C')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
+    GetPTF("testingMINMAX4('A')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
+    GetPTF("testingMINMAX4('A','B')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
+    GetPTF("testingMINMAX4('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX4('A','B','C')\" with the specified arguments. Method \"concat\" requires maximal 0 arguments.");
 
     //CASE 9
     //min =-1, max = 2, 
     GetPTF("testingMINMAX5()").aSerialized("{concat()}");
     GetPTF("testingMINMAX5('A')").aSerialized("{concat('A')}");
     GetPTF("testingMINMAX5('A','B')").aSerialized("{concat('A','B')}");
-    GetPTF("testingMINMAX5('A','B','C')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX5('A','B','C')\" with the specified arguments. Method \"concat\" requires maximal 2 arguments.");
+    GetPTF("testingMINMAX5('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX5('A','B','C')\" with the specified arguments. Method \"concat\" requires maximal 2 arguments.");
 
     //CASE 10
     // min =1, max = 2, 
-    GetPTF("testingMINMAX6()").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX6()\" with the specified arguments. Method \"concat\" requires between 1 and 2 arguments.");
+    GetPTF("testingMINMAX6()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX6()\" with the specified arguments. Method \"concat\" requires between 1 and 2 arguments.");
     GetPTF("testingMINMAX6('A')").aSerialized("{concat('A')}");
     GetPTF("testingMINMAX6('A','B')").aSerialized("{concat('A','B')}");
-    GetPTF("testingMINMAX6('A','B','C')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX6('A','B','C')\" with the specified arguments. Method \"concat\" requires between 1 and 2 arguments.");
+    GetPTF("testingMINMAX6('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX6('A','B','C')\" with the specified arguments. Method \"concat\" requires between 1 and 2 arguments.");
 
     //CASE 11
     // min =1, max = 2, 
-    GetPTF("testingMINMAX7()").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7()\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
+    GetPTF("testingMINMAX7()").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7()\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
     GetPTF("testingMINMAX7('A')").aSerialized("{concat('A')}");
-    GetPTF("testingMINMAX7('A','B')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B')\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
-    GetPTF("testingMINMAX7('A','B','C')").aExType(ExpressionParserException.class)
-        .aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B','C')\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
+    GetPTF("testingMINMAX7('A','B')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B')\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
+    GetPTF("testingMINMAX7('A','B','C')").aExType(ExpressionParserException.class).aExMsgText("No applicable method found for \"concat\" at position 1 in \"testingMINMAX7('A','B','C')\" with the specified arguments. Method \"concat\" requires exact 1 argument(s).");
 
     //CASE 12
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=concat('a' 'b')
     //-->')' or ',' expected at position 11.
-    GetPTF("concat('a' 'b')")
-        .aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
+    GetPTF("concat('a' 'b')").aExMsgText("\")\" or \",\" expected after position 10 in \"concat('a' 'b')\".");
 
   }
 
   @Test
-  public void testPMreadParenthesis()
-  {
+  public void testPMreadParenthesis() {
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=(123
     //-->')' or operator expected at position 4.
-    GetPTF("(123").aExType(ExpressionParserException.class)
-        .aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 1 in \"(123\".");
+    GetPTF("(123").aExType(ExpressionParserException.class).aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 1 in \"(123\".");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=(123 add (456
     //-->')' or operator expected at position 13.
-    GetPTF("(123 add (456").aExType(ExpressionParserException.class)
-        .aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 10 in \"(123 add (456\".");
+    GetPTF("(123 add (456").aExType(ExpressionParserException.class).aExMsgText("Missing closing parenthesis \")\" for opening parenthesis \"(\" at position 10 in \"(123 add (456\".");
 
   }
 
@@ -292,9 +244,7 @@ public class TestParserExceptions extends TestBase {
   {
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123 add 'abc'
     //-->Operator 'add' incompatible with operand types 'System.Int32' and 'System.String' at position 4.
-    GetPTF("123 add 'abc'").aExType(ExpressionParserException.class)
-        .aExKey(ExpressionParserException.INVALID_TYPES_FOR_BINARY_OPERATOR)
-        .aExMsgText("Operator \"add\" incompatible with operand types \"System.Uint7\" and \"Edm.String\" at position 5 in \"123 add 'abc'\".");
+    GetPTF("123 add 'abc'").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TYPES_FOR_BINARY_OPERATOR).aExMsgText("Operator \"add\" incompatible with operand types \"System.Uint7\" and \"Edm.String\" at position 5 in \"123 add 'abc'\".");
   }
 
   @Test
@@ -304,8 +254,7 @@ public class TestParserExceptions extends TestBase {
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=year(327686)
     //-->No applicable function found for 'year' at position 0 with the specified arguments. The functions considered are: year(System.DateTime).
     String aInt32 = "327686";
-    GetPTF("year(" + aInt32 + ")")
-        .aExMsgText("No applicable method found for \"year\" at position 1 in \"year(327686)\" for the specified argument types.");
+    GetPTF("year(" + aInt32 + ")").aExMsgText("No applicable method found for \"year\" at position 1 in \"year(327686)\" for the specified argument types.");
   }
 
   @Test
@@ -313,106 +262,80 @@ public class TestParserExceptions extends TestBase {
   {
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter='123
     //-->Unterminated string literal at position 4 in ''123'.
-    GetPTF("'123").aExType(ExpressionParserException.class)
-        .aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING)
-        .aExMsgText("Unterminated string literal at position 1 in \"'123\".");
+    GetPTF("'123").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText("Unterminated string literal at position 1 in \"'123\".");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add%20'123
     //-->Unterminated string literal at position 10 in '1 add '123'.
-    GetPTF("1 add '123").aExType(ExpressionParserException.class)
-        .aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING)
-        .aExMsgText("Unterminated string literal at position 7 in \"1 add '123\".");
+    GetPTF("1 add '123").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText("Unterminated string literal at position 7 in \"1 add '123\".");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=datetime'123
     //-->Unterminated literal at position 12 in 'datetime'123'.
-    GetPTF("datetime'123").aExType(ExpressionParserException.class)
-        .aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING)
-        .aExMsgText("Unterminated string literal at position 9 in \"datetime'123\".");
+    GetPTF("datetime'123").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.TOKEN_UNDETERMINATED_STRING).aExMsgText("Unterminated string literal at position 9 in \"datetime'123\".");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123%20456
     //-->Expression of type 'System.Boolean' expected at position 0.
-    GetPTF("123 456").aExType(ExpressionParserException.class)
-        .aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING)
-        .aExMsgText("Invalid token \"456\" detected after parsing at position 5 in \"123 456\".");
+    GetPTF("123 456").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText("Invalid token \"456\" detected after parsing at position 5 in \"123 456\".");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=123%20456
     //-->Expression of type 'System.Boolean' expected at position 0.
-    GetPTF("123 456 789").aExType(ExpressionParserException.class)
-        .aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING)
-        .aExMsgText("Invalid token \"456\" detected after parsing at position 5 in \"123 456 789\".");
+    GetPTF("123 456 789").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText("Invalid token \"456\" detected after parsing at position 5 in \"123 456 789\".");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=abc%20abc
     //-->No property 'abc' exists in type 'ODataWeb.Northwind.Model.Supplier' at position 0.
-    GetPTF("abc abc").aExType(ExpressionParserException.class)
-        .aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING)
-        .aExMsgText("Invalid token \"abc\" detected after parsing at position 5 in \"abc abc\".");
+    GetPTF("abc abc").aExType(ExpressionParserException.class).aExKey(ExpressionParserException.INVALID_TRAILING_TOKEN_DETECTED_AFTER_PARSING).aExMsgText("Invalid token \"abc\" detected after parsing at position 5 in \"abc abc\".");
   }
 
   @Test
-  public void testAdditionalStuff()
-  {
+  public void testAdditionalStuff() {
 
-    GetPTF("( A mul B )/X eq TEST")
-        .aSerialized("{{{A mul B}/X} eq TEST}");
+    GetPTF("( A mul B )/X eq TEST").aSerialized("{{{A mul B}/X} eq TEST}");
 
-    GetPTF("( 1 mul 2 )/X eq TEST")
-        .aSerialized("{{{1 mul 2}/X} eq TEST}");
+    GetPTF("( 1 mul 2 )/X eq TEST").aSerialized("{{{1 mul 2}/X} eq TEST}");
 
     //CASE 1
     EdmEntityType edmEtAllTypes = edmInfo.getTypeEtAllTypes();
-    GetPTF(edmEtAllTypes, "( 1 mul 2 )/X eq TEST")
-        .aExMsgText("Leftside of method operator at position 12 is not a property in \"( 1 mul 2 )/X eq TEST\".");
+    GetPTF(edmEtAllTypes, "( 1 mul 2 )/X eq TEST").aExMsgText("Leftside of method operator at position 12 is not a property in \"( 1 mul 2 )/X eq TEST\".");
 
     //CASE 2
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=notsupportedfunction('a')
     //-->Unknown function 'notsupportedfunction' at position 0.
-    GetPTF("notsupportedfunction('a')")
-        .aExMsgText("Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction('a')\".");
+    GetPTF("notsupportedfunction('a')").aExMsgText("Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction('a')\".");
 
     //CASE 3 
     //http://services.odata.org/Northwind/Northwind.svc/Products/?$filter=notsupportedfunction('a')
     //-->Unknown function 'notsupportedfunction' at position 0.
-    GetPTF("notsupportedfunction    ('a')")
-        .aExMsgText("Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction    ('a')\".");
+    GetPTF("notsupportedfunction    ('a')").aExMsgText("Unknown function \"notsupportedfunction\" at position 1 in \"notsupportedfunction    ('a')\".");
 
     //CASE 4
     //Use \ instead of /
-    GetPTF("Address\\NotAProperty")
-        .aExMsgText("Error while tokenizing a ODATA expression on token \"\\\" at position 8 in \"Address\\NotAProperty\".");
+    GetPTF("Address\\NotAProperty").aExMsgText("Error while tokenizing a ODATA expression on token \"\\\" at position 8 in \"Address\\NotAProperty\".");
 
     //CASE 5
-    GetPTF("-(-(- 2d)))")
-        .aExMsgText("Invalid token \")\" detected after parsing at position 11 in \"-(-(- 2d)))\".");
+    GetPTF("-(-(- 2d)))").aExMsgText("Invalid token \")\" detected after parsing at position 11 in \"-(-(- 2d)))\".");
 
     //CASE 6
-    GetPTF("a b")
-        .aExMsgText("Invalid token \"b\" detected after parsing at position 3 in \"a b\".");
+    GetPTF("a b").aExMsgText("Invalid token \"b\" detected after parsing at position 3 in \"a b\".");
 
     //CASE 7 
-    GetPTF("a eq b b")
-        .aExMsgText("Invalid token \"b\" detected after parsing at position 8 in \"a eq b b\".");
+    GetPTF("a eq b b").aExMsgText("Invalid token \"b\" detected after parsing at position 8 in \"a eq b b\".");
 
     //CASE 8
-    GetPTF(edmEtAllTypes, "year(Complex)")
-        .aExMsgText("No applicable method found for \"year\" at position 1 in \"year(Complex)\" for the specified argument types.");
+    GetPTF(edmEtAllTypes, "year(Complex)").aExMsgText("No applicable method found for \"year\" at position 1 in \"year(Complex)\" for the specified argument types.");
 
     //CASE 9
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add%202
     //-->Expression of type 'System.Boolean' expected at position 0.
-    GetPTF_onlyBinary("1 add 2")
-        .aExMsgText("Expression of type \"Edm.Boolean\" expected at position 1 in \"1 add 2\" (actual type is \"Edm.SByte\").");
+    GetPTF_onlyBinary("1 add 2").aExMsgText("Expression of type \"Edm.Boolean\" expected at position 1 in \"1 add 2\" (actual type is \"Edm.SByte\").");
 
     //CASE 10
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add
     //-->Expression expected at position 5.
-    GetPTF_onlyBinary("1 add")
-        .aExMsgText("Expression expected after position 5 in \"1 add\".");
+    GetPTF_onlyBinary("1 add").aExMsgText("Expression expected after position 5 in \"1 add\".");
 
     //CASE 11
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=1%20add
     //-->Expression expected at position 5.
-    GetPTF_onlyBinary("1 add   ")
-        .aExMsgText("Expression expected after position 5 in \"1 add   \".");
+    GetPTF_onlyBinary("1 add   ").aExMsgText("Expression expected after position 5 in \"1 add   \".");
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
index 6b0e48f..3c7b6ba 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
@@ -20,8 +20,6 @@ package org.apache.olingo.odata2.core.uri.expression;
 
 import static org.junit.Assert.fail;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmComplexType;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -46,12 +44,12 @@ import org.apache.olingo.odata2.core.edm.EdmString;
 import org.apache.olingo.odata2.core.edm.EdmTime;
 import org.apache.olingo.odata2.core.edm.Uint7;
 import org.apache.olingo.odata2.core.edm.provider.EdmComplexPropertyImplProv;
+import org.junit.Test;
 
 /**
  *  
  */
-public class TestSpec extends TestBase
-{
+public class TestSpec extends TestBase {
   final static String aBoolean = "true";
   final static String aBinary = "binary'FA12AAA1'";
   final static String aBit = "1";
@@ -89,8 +87,7 @@ public class TestSpec extends TestBase
   final EdmTime timeInst = EdmTime.getInstance();
 
   @Test
-  public void testMinimumSpecReq()
-  {
+  public void testMinimumSpecReq() {
 
     //ADD
     GetPTF(aDecimal + " add " + aDecimal).aEdmType(decimalInst).aSerialized("{" + aDecimal + " add " + aDecimal + "}");
@@ -284,8 +281,7 @@ public class TestSpec extends TestBase
   }
 
   @Test
-  public void testPropertiesWithEdm()
-  {
+  public void testPropertiesWithEdm() {
     try {
       EdmEntityType edmEtAllTypes = edmInfo.getTypeEtAllTypes();
       EdmProperty string = (EdmProperty) edmEtAllTypes.getProperty("String");
@@ -301,30 +297,16 @@ public class TestSpec extends TestBase
 
       GetPTF(edmEtAllTypes, "String").aEdmProperty(string).aEdmType(stringType);
 
-      GetPTF(edmEtAllTypes, "'text' eq String")
-          .root().aKind(ExpressionKind.BINARY);
+      GetPTF(edmEtAllTypes, "'text' eq String").root().aKind(ExpressionKind.BINARY);
 
-      GetPTF(edmEtAllTypes, "Complex/String")
-          .root().left().aEdmProperty(complex).aEdmType(complexType)
-          .root().right().aEdmProperty(complexString).aEdmType(complexStringType)
-          .root().aKind(ExpressionKind.MEMBER).aEdmType(complexStringType);
+      GetPTF(edmEtAllTypes, "Complex/String").root().left().aEdmProperty(complex).aEdmType(complexType).root().right().aEdmProperty(complexString).aEdmType(complexStringType).root().aKind(ExpressionKind.MEMBER).aEdmType(complexStringType);
 
-      GetPTF(edmEtAllTypes, "Complex/Address/City")
-          .root().aKind(ExpressionKind.MEMBER)
-          .root().left().aKind(ExpressionKind.MEMBER)
-          .root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(complexType)
-          .root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(complexAddressType)
-          .root().left().aEdmType(complexAddressType)
-          .root().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType)
-          .root().aEdmType(complexAddressCityType);
+      GetPTF(edmEtAllTypes, "Complex/Address/City").root().aKind(ExpressionKind.MEMBER).root().left().aKind(ExpressionKind.MEMBER).root().left().left().aKind(ExpressionKind.PROPERTY).aEdmProperty(complex).aEdmType(complexType).root().left().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddress).aEdmType(complexAddressType).root().left().aEdmType(complexAddressType).root().right().aKind(ExpressionKind.PROPERTY).aEdmProperty(complexAddressCity).aEdmType(complexAddressCityType).root().aEdmType(complexAddressCityType);
 
       EdmProperty boolean_ = (EdmProperty) edmEtAllTypes.getProperty("Boolean");
       EdmSimpleType boolean_Type = (EdmSimpleType) boolean_.getType();
 
-      GetPTF(edmEtAllTypes, "not Boolean")
-          .aKind(ExpressionKind.UNARY)
-          .aEdmType(boolean_Type)
-          .right().aEdmProperty(boolean_).aEdmType(boolean_Type);
+      GetPTF(edmEtAllTypes, "not Boolean").aKind(ExpressionKind.UNARY).aEdmType(boolean_Type).right().aEdmProperty(boolean_).aEdmType(boolean_Type);
 
     } catch (EdmException e) {
       fail("Error in testPropertiesWithEdm:" + e.getLocalizedMessage());
@@ -333,8 +315,7 @@ public class TestSpec extends TestBase
   }
 
   @Test
-  public void testDeepParenthesis()
-  {
+  public void testDeepParenthesis() {
     GetPTF("2d").aSerialized("2d");
     GetPTF("(2d)").aSerialized("2d");
     GetPTF("((2d))").aSerialized("2d");

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
index 390ced0..58990b9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestTokenizer.java
@@ -25,110 +25,61 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.codec.binary.Hex;
 import org.junit.Test;
 
-public class TestTokenizer
-{
+public class TestTokenizer {
 
   @Test
-  public void tokenizeWhiteSpaces() throws Exception
-  {
+  public void tokenizeWhiteSpaces() throws Exception {
     //space
-    getTTW(" ")
-        .at(0)
-        .aKind(TokenKind.WHITESPACE)
-        .aUriLiteral(" ")
-        .aPosition(0);
-
-    getTTW("   ")
-        .at(0)
-        .aKind(TokenKind.WHITESPACE)
-        .aUriLiteral("   ")
-        .aPosition(0);
-
-    getTTW("A   ")
-        .at(1)
-        .aKind(TokenKind.WHITESPACE)
-        .aUriLiteral("   ")
-        .aPosition(1);
-
-    getTTW("   B")
-        .at(0)
-        .aKind(TokenKind.WHITESPACE)
-        .aUriLiteral("   ")
-        .aPosition(0);
-
-    getTTW("A   B")
-        .at(1)
-        .aKind(TokenKind.WHITESPACE)
-        .aUriLiteral("   ")
-        .aPosition(1)
-        .at(2)
-        .aKind(TokenKind.LITERAL)
-        .aUriLiteral("B")
-        .aPosition(4);
-
-    getTTW("A   B   C")
-        .at(3)
-        .aKind(TokenKind.WHITESPACE)
-        .aUriLiteral("   ")
-        .aPosition(5);
+    getTTW(" ").at(0).aKind(TokenKind.WHITESPACE).aUriLiteral(" ").aPosition(0);
+
+    getTTW("   ").at(0).aKind(TokenKind.WHITESPACE).aUriLiteral("   ").aPosition(0);
+
+    getTTW("A   ").at(1).aKind(TokenKind.WHITESPACE).aUriLiteral("   ").aPosition(1);
+
+    getTTW("   B").at(0).aKind(TokenKind.WHITESPACE).aUriLiteral("   ").aPosition(0);
+
+    getTTW("A   B").at(1).aKind(TokenKind.WHITESPACE).aUriLiteral("   ").aPosition(1).at(2).aKind(TokenKind.LITERAL).aUriLiteral("B").aPosition(4);
+
+    getTTW("A   B   C").at(3).aKind(TokenKind.WHITESPACE).aUriLiteral("   ").aPosition(5);
   }
 
   @Test
-  public void tokenizeSymbols() throws Exception
-  {
+  public void tokenizeSymbols() throws Exception {
 
     //parentheses
     getTT("(").aKind(TokenKind.OPENPAREN).aUriLiteral("(");
-    getTT("abc(")
-        .at(1)
-        .aKind(TokenKind.OPENPAREN).aUriLiteral("(")
-        .aPosition(3);
+    getTT("abc(").at(1).aKind(TokenKind.OPENPAREN).aUriLiteral("(").aPosition(3);
 
     getTT(")").aKind(TokenKind.CLOSEPAREN).aUriLiteral(")");
-    getTT("abc)")
-        .at(1)
-        .aKind(TokenKind.CLOSEPAREN).aUriLiteral(")")
-        .aPosition(3);
+    getTT("abc)").at(1).aKind(TokenKind.CLOSEPAREN).aUriLiteral(")").aPosition(3);
 
     //symbol
     getTT(",").aKind(TokenKind.COMMA).aUriLiteral(",");
-    getTT("abc,")
-        .at(1)
-        .aKind(TokenKind.COMMA).aUriLiteral(",")
-        .aPosition(3);
+    getTT("abc,").at(1).aKind(TokenKind.COMMA).aUriLiteral(",").aPosition(3);
 
     //minus
     getTT("-").aKind(TokenKind.SYMBOL).aUriLiteral("-");
-    getTT("abc -")
-        .at(1)
-        .aKind(TokenKind.SYMBOL).aUriLiteral("-")
-        .aPosition(4);
+    getTT("abc -").at(1).aKind(TokenKind.SYMBOL).aUriLiteral("-").aPosition(4);
 
     //minus after literal belongs to literal
-    getTT("abc-")
-        .at(0)
-        .aKind(TokenKind.LITERAL).aUriLiteral("abc-")
-        .aPosition(0);
+    getTT("abc-").at(0).aKind(TokenKind.LITERAL).aUriLiteral("abc-").aPosition(0);
 
   }
 
-  public static String HexToBase64(final String hex)
-  {
+  public static String HexToBase64(final String hex) {
     String base64 = "";
     byte bArr[];
     try {
       bArr = Hex.decodeHex(hex.toCharArray());
       base64 = Base64.encodeBase64String(bArr);
-    } catch (DecoderException e)
-    {
+    } catch (DecoderException e) {
       fail("Error in Unittest preparation ( HEX->base64");
     }
     return base64;
   }
 
   @Test
-  public void tokenizeTypes() throws Exception
-  {
+  public void tokenizeTypes() throws Exception {
     getTT("a").aKind(TokenKind.LITERAL).aUriLiteral("a").aPosition(0);
     getTT("abc a").at(1).aKind(TokenKind.LITERAL).aUriLiteral("a").aPosition(4);
 
@@ -153,56 +104,40 @@ public class TestTokenizer
   }
 
   @Test
-  public void tokenizeOperators() throws Exception
-  {
+  public void tokenizeOperators() throws Exception {
     getTT("a eq b").at(1).aKind(TokenKind.LITERAL).aUriLiteral("eq");
     getTT("a eqotto b").at(1).aKind(TokenKind.LITERAL).aUriLiteral("eqotto");
   }
 
   @Test
-  public void testExceptions() throws Exception
-  {
+  public void testExceptions() throws Exception {
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter='a
     //-->Unterminated string literal at position 2 in ''a'.
-    getTT("'a")
-        .aExMsgText("Unterminated string literal at position 1 in \"'a\".");
+    getTT("'a").aExMsgText("Unterminated string literal at position 1 in \"'a\".");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=X'g'
     //-->Unrecognized 'Edm.Binary' literal 'X'g'' in '0'.
-    getTT("X'g'")
-        .aExMsgText("Type detection error for string like token 'X'g'' at position '1'.");
+    getTT("X'g'").aExMsgText("Type detection error for string like token 'X'g'' at position '1'.");
 
     //http://services.odata.org/Northwind/Northwind.svc/Products(1)/Supplier?$filter=\
     //-->Syntax error '\' at position 0.
-    getTT("\\")
-        .aExMsgText("Unknown character '\\' at position '0' detected in \"\\\".");
+    getTT("\\").aExMsgText("Unknown character '\\' at position '0' detected in \"\\\".");
   }
 
   @Test
-  public void tokenizeFunction() throws Exception
-  {
-    getTT("substringof('10')")
-        .at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof")
-        .at(2).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
-
-    getTT("substringof  (  '10'  )  ")
-        .at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof")
-        .at(2).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
+  public void tokenizeFunction() throws Exception {
+    getTT("substringof('10')").at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof").at(2).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
+
+    getTT("substringof  (  '10'  )  ").at(0).aKind(TokenKind.LITERAL).aUriLiteral("substringof").at(2).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'10'");
   }
 
   @Test
-  public void testEx1111ceptions() throws Exception
-  {
-    getTT("a 1")
-        .at(0).aKind(TokenKind.LITERAL).aUriLiteral("a")
-        .at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("1");
+  public void testEx1111ceptions() throws Exception {
+    getTT("a 1").at(0).aKind(TokenKind.LITERAL).aUriLiteral("a").at(1).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("1");
 
-    getTT("a eq b").at(0).aKind(TokenKind.LITERAL).aUriLiteral("a")
-        .at(1).aKind(TokenKind.LITERAL).aUriLiteral("eq")
-        .at(2).aKind(TokenKind.LITERAL).aUriLiteral("b");
+    getTT("a eq b").at(0).aKind(TokenKind.LITERAL).aUriLiteral("a").at(1).aKind(TokenKind.LITERAL).aUriLiteral("eq").at(2).aKind(TokenKind.LITERAL).aUriLiteral("b");
 
-    getTT("start_date eq datetime'2011-01-12T00:00:00' and end_date eq datetime'2011-12-31T00:00:00'")
-        .at(2).aUriLiteral("datetime'2011-01-12T00:00:00'");
+    getTT("start_date eq datetime'2011-01-12T00:00:00' and end_date eq datetime'2011-12-31T00:00:00'").at(2).aUriLiteral("datetime'2011-01-12T00:00:00'");
 
     getTT("'a%b'").at(0).aKind(TokenKind.SIMPLE_TYPE).aUriLiteral("'a%b'");
 
@@ -212,8 +147,7 @@ public class TestTokenizer
    * Create TokenTool ( and Token list) without respecting whitespaces
    * @param expression Expression to be tokenized
    */
-  public TokenTool getTT(final String expression)
-  {
+  public TokenTool getTT(final String expression) {
     return new TokenTool(expression, false);
   }
 
@@ -221,8 +155,7 @@ public class TestTokenizer
    * Create TokenTool ( and Token list) without respecting whitespaces
    * @param expression Expression to be tokenized
    */
-  public TokenTool getTTW(final String expression)
-  {
+  public TokenTool getTTW(final String expression) {
     return new TokenTool(expression, true);
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
index ac1e0b7..a1c714b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TokenTool.java
@@ -23,17 +23,15 @@ import static org.junit.Assert.fail;
 
 import java.util.Locale;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import org.apache.olingo.odata2.api.exception.MessageReference;
 import org.apache.olingo.odata2.api.exception.ODataMessageException;
 import org.apache.olingo.odata2.api.uri.expression.ExpressionParserException;
 import org.apache.olingo.odata2.core.exception.MessageService;
 import org.apache.olingo.odata2.core.exception.MessageService.Message;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-public class TokenTool
-{
+public class TokenTool {
   protected Token token;
   protected TokenList tokens = null;
   private Exception curException;
@@ -44,8 +42,7 @@ public class TokenTool
   private static final Logger log = LoggerFactory.getLogger(ParserTool.class);
   private static final Locale DEFAULT_LANGUAGE = new Locale("test", "SAP");
 
-  public TokenTool(final String expression, final boolean wsp)
-  {
+  public TokenTool(final String expression, final boolean wsp) {
     dout("TokenTool - Testing: " + expression);
     this.expression = expression;
 
@@ -69,8 +66,7 @@ public class TokenTool
    * @return Returns <code>this</code>
    * @throws AssertionError
    */
-  public TokenTool at(final int index)
-  {
+  public TokenTool at(final int index) {
     token = tokens.elementAt(index);
     return this;
   }
@@ -82,8 +78,7 @@ public class TokenTool
    * @return Returns <code>this</code>
    * @throws AssertionError 
    */
-  public TokenTool aKind(final TokenKind kind)
-  {
+  public TokenTool aKind(final TokenKind kind) {
     assertEquals(kind, token.getKind());
     return this;
   }
@@ -95,8 +90,7 @@ public class TokenTool
    * @return Returns <code>this</code>
    * @throws AssertionError
    */
-  public TokenTool aEdmType(final int edmType)
-  {
+  public TokenTool aEdmType(final int edmType) {
     assertEquals(edmType, token.getEdmType());
     return this;
   }
@@ -108,27 +102,23 @@ public class TokenTool
    * @return Returns <code>this</code>
    * @throws AssertionError
    */
-  public TokenTool aUriLiteral(final String stringValue)
-  {
+  public TokenTool aUriLiteral(final String stringValue) {
     assertEquals(stringValue, token.getUriLiteral());
     return this;
   }
 
-  public TokenTool aPosition(final int position)
-  {
+  public TokenTool aPosition(final int position) {
     assertEquals(position, token.getPosition());
     return this;
   }
 
-  public static void dout(final String out)
-  {
+  public static void dout(final String out) {
     if (debug) {
       log.debug(out);
     }
   }
 
-  public static void out(final String out)
-  {
+  public static void out(final String out) {
     log.debug(out);
   }
 
@@ -136,21 +126,17 @@ public class TokenTool
    * Verifies that all place holders in the message text definition of the thrown exception are provided with content
    * @return TokenTool
    */
-  public TokenTool aExMsgContentAllSet()
-  {
+  public TokenTool aExMsgContentAllSet() {
     String info = "aExMessageTextNoEmptyTag(" + expression + ")-->";
-    if (curException == null)
-    {
+    if (curException == null) {
       fail("Error in aExMessageText: Expected exception.");
     }
 
     ODataMessageException messageException;
 
-    try
-    {
+    try {
       messageException = (ODataMessageException) curException;
-    } catch (ClassCastException ex)
-    {
+    } catch (ClassCastException ex) {
       fail("Error in aExNext: curException not an ODataMessageException");
       return this;
     }
@@ -160,8 +146,7 @@ public class TokenTool
 
     dout(info);
 
-    if (ms.getText().contains("[%"))
-    {
+    if (ms.getText().contains("[%")) {
       fail(info);
     }
     return this;
@@ -171,21 +156,17 @@ public class TokenTool
    * Verifies that the message text of the thrown exception is not empty
    * @return TokenTool
    */
-  public TokenTool aExMsgNotEmpty()
-  {
+  public TokenTool aExMsgNotEmpty() {
     String info = "aExTextNotEmpty(" + expression + ")-->";
-    if (curException == null)
-    {
+    if (curException == null) {
       fail("Error in aExMessageText: Expected exception.");
     }
 
     ODataMessageException messageException;
 
-    try
-    {
+    try {
       messageException = (ODataMessageException) curException;
-    } catch (ClassCastException ex)
-    {
+    } catch (ClassCastException ex) {
       fail("Error in aExNext: curException not an ODataMessageException");
       return this;
     }
@@ -194,30 +175,25 @@ public class TokenTool
     info = "  " + info + "check if Messagetext is empty";
     dout(info);
 
-    if (ms.getText().length() == 0)
-    {
+    if (ms.getText().length() == 0) {
       fail(info);
     }
     return this;
   }
 
-  public TokenTool aExKey(final MessageReference expressionExpectedAtPos)
-  {
+  public TokenTool aExKey(final MessageReference expressionExpectedAtPos) {
     String expectedKey = expressionExpectedAtPos.getKey();
     ODataMessageException messageException;
 
     String info = "GetExceptionType(" + expression + ")-->";
 
-    if (curException == null)
-    {
+    if (curException == null) {
       fail("Error in aExType: Expected exception");
     }
 
-    try
-    {
+    try {
       messageException = (ODataMessageException) curException;
-    } catch (ClassCastException ex)
-    {
+    } catch (ClassCastException ex) {
       fail("Error in aExNext: curException not an ODataMessageException");
       return this;
     }
@@ -225,27 +201,22 @@ public class TokenTool
     String actualKey = messageException.getMessageReference().getKey();
     dout("  " + info + "Expected key: " + expectedKey + " Actual: " + actualKey);
 
-    if (expectedKey != actualKey)
-    {
+    if (expectedKey != actualKey) {
       fail("  " + info + "Expected: " + expectedKey + " Actual: " + actualKey);
     }
     return this;
   }
 
-  public TokenTool printExMessage()
-  {
+  public TokenTool printExMessage() {
     ODataMessageException messageException;
 
-    if (curException == null)
-    {
+    if (curException == null) {
       fail("Error in aExMsgPrint: Expected exception");
     }
 
-    try
-    {
+    try {
       messageException = (ODataMessageException) curException;
-    } catch (ClassCastException ex)
-    {
+    } catch (ClassCastException ex) {
       fail("Error in aExNext: curException not an ODataMessageException");
       return this;
     }
@@ -264,21 +235,17 @@ public class TokenTool
    *   Expected message text 
    * @return  this
    */
-  public TokenTool aExMsgText(final String messageText)
-  {
+  public TokenTool aExMsgText(final String messageText) {
     String info = "aExMessageText(" + expression + ")-->";
-    if (curException == null)
-    {
+    if (curException == null) {
       fail("Error in aExMessageText: Expected exception.");
     }
 
     ODataMessageException messageException;
 
-    try
-    {
+    try {
       messageException = (ODataMessageException) curException;
-    } catch (ClassCastException ex)
-    {
+    } catch (ClassCastException ex) {
       fail("Error in aExNext: curException not an ODataMessageException");
       return this;
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
index f8386d6..68a4312 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/VisitorTool.java
@@ -40,8 +40,7 @@ import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
 public class VisitorTool implements ExpressionVisitor {
 
   @Override
-  public Object visitBinary(final BinaryExpression binaryExpression, final BinaryOperator operator, final Object leftSide, final Object rightSide)
-  {
+  public Object visitBinary(final BinaryExpression binaryExpression, final BinaryOperator operator, final Object leftSide, final Object rightSide) {
     return "{" + leftSide.toString() + " " + operator.toUriLiteral() + " " + rightSide.toString() + "}";
   }
 
@@ -51,21 +50,18 @@ public class VisitorTool implements ExpressionVisitor {
   }
 
   @Override
-  public Object visitLiteral(final LiteralExpression literal, final EdmLiteral edmLiteral)
-  {
+  public Object visitLiteral(final LiteralExpression literal, final EdmLiteral edmLiteral) {
     return "" + literal.getUriLiteral() + "";
   }
 
   @Override
-  public Object visitMethod(final MethodExpression methodExpression, final MethodOperator method, final List<Object> retParameters)
-  {
+  public Object visitMethod(final MethodExpression methodExpression, final MethodOperator method, final List<Object> retParameters) {
     StringBuilder sb = new StringBuilder();
     sb.append("{");
     sb.append(method.toUriLiteral());
 
     sb.append("(");
-    for (int i = 0; i < retParameters.size(); i++)
-    {
+    for (int i = 0; i < retParameters.size(); i++) {
       if (i != 0) {
         sb.append(",");
       }
@@ -78,33 +74,28 @@ public class VisitorTool implements ExpressionVisitor {
   }
 
   @Override
-  public Object visitMember(final MemberExpression memberExpression, final Object source, final Object path)
-  {
+  public Object visitMember(final MemberExpression memberExpression, final Object source, final Object path) {
     return "{" + source.toString() + "/" + path.toString() + "}";
   }
 
   @Override
-  public Object visitProperty(final PropertyExpression literal, final String uriLiteral, final EdmTyped edmProperty)
-  {
+  public Object visitProperty(final PropertyExpression literal, final String uriLiteral, final EdmTyped edmProperty) {
     return uriLiteral;
   }
 
   @Override
-  public Object visitUnary(final UnaryExpression unaryExpression, final UnaryOperator operator, final Object operand)
-  {
+  public Object visitUnary(final UnaryExpression unaryExpression, final UnaryOperator operator, final Object operand) {
     return "{" + operator.toUriLiteral() + " " + operand.toString() + "}";
   }
 
   @Override
-  public Object visitOrderByExpression(final OrderByExpression orderByExpression, final String expressionString, final List<Object> orders)
-  {
+  public Object visitOrderByExpression(final OrderByExpression orderByExpression, final String expressionString, final List<Object> orders) {
     StringBuilder sb = new StringBuilder();
     sb.append("{");
     sb.append("oc");
 
     sb.append("(");
-    for (int i = 0; i < orders.size(); i++)
-    {
+    for (int i = 0; i < orders.size(); i++) {
       if (i != 0) {
         sb.append(",");
       }
@@ -117,8 +108,7 @@ public class VisitorTool implements ExpressionVisitor {
   }
 
   @Override
-  public Object visitOrder(final OrderExpression orderExpression, final Object filterResult, final SortOrder sortOrder)
-  {
+  public Object visitOrder(final OrderExpression orderExpression, final Object filterResult, final SortOrder sortOrder) {
     return "{o(" + filterResult + ", " + sortOrder.toString() + ")}";
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
index 3a1339e..1c0816a 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
@@ -75,8 +75,7 @@ public class ODataMessageTextVerifier {
 
   private void assertExistMessage(final MessageReference msgRef) {
     final String text = getMessage(msgRef);
-    if (text == null)
-    {
+    if (text == null) {
       return; // checked in getMessage
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
index af1aed2..acaf2ad 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
@@ -28,8 +28,7 @@ import org.apache.olingo.odata2.api.edm.EdmException;
  * Helper for the entity data model used as technical reference scenario.
  *  
  */
-public class TecEdmInfo
-{
+public class TecEdmInfo {
   private final Edm edm;
 
   public TecEdmInfo(final Edm edm) {
@@ -38,10 +37,7 @@ public class TecEdmInfo
 
   public EdmEntityType getTypeEtAllTypes() {
     try {
-      return edm
-          .getEntityContainer(TechnicalScenarioEdmProvider.ENTITY_CONTAINER_1)
-          .getEntitySet(TechnicalScenarioEdmProvider.ES_ALL_TYPES)
-          .getEntityType();
+      return edm.getEntityContainer(TechnicalScenarioEdmProvider.ENTITY_CONTAINER_1).getEntitySet(TechnicalScenarioEdmProvider.ES_ALL_TYPES).getEntityType();
     } catch (final EdmException e) {
       fail("Error in test setup" + e.getLocalizedMessage());
     }


[09/22] git commit: remove @author - javadoc warning

Posted by sk...@apache.org.
remove @author - javadoc warning


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

Branch: refs/heads/master
Commit: 420c1b7328e33e876fa792efb5099292fdf5c4ea
Parents: be9827d
Author: Stephan Klevenz <st...@sap.com>
Authored: Wed Jul 31 09:57:06 2013 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Wed Jul 31 09:57:06 2013 +0200

----------------------------------------------------------------------
 .../apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java  | 2 +-
 .../olingo/odata2/processor/api/jpa/ODataJPAProcessor.java       | 2 +-
 .../olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java    | 2 +-
 .../processor/api/jpa/access/JPAEdmMappingModelAccess.java       | 2 +-
 .../olingo/odata2/processor/api/jpa/access/JPAFunction.java      | 2 +-
 .../olingo/odata2/processor/api/jpa/access/JPAJoinClause.java    | 4 ++--
 .../olingo/odata2/processor/api/jpa/access/JPAMethodContext.java | 4 ++--
 .../odata2/processor/api/jpa/access/JPAMethodContextView.java    | 2 +-
 .../olingo/odata2/processor/api/jpa/access/JPAProcessor.java     | 2 +-
 .../odata2/processor/api/jpa/access/JPAProcessorRegistry.java    | 2 +-
 .../olingo/odata2/processor/api/jpa/access/package-info.java     | 2 +-
 .../odata2/processor/api/jpa/exception/ODataJPAException.java    | 2 +-
 .../processor/api/jpa/exception/ODataJPAMessageService.java      | 2 +-
 .../processor/api/jpa/exception/ODataJPAModelException.java      | 2 +-
 .../processor/api/jpa/exception/ODataJPARuntimeException.java    | 2 +-
 .../olingo/odata2/processor/api/jpa/exception/package-info.java  | 2 +-
 .../odata2/processor/api/jpa/factory/JPAAccessFactory.java       | 2 +-
 .../odata2/processor/api/jpa/factory/JPQLBuilderFactory.java     | 2 +-
 .../odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java  | 2 +-
 .../olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java | 2 +-
 .../olingo/odata2/processor/api/jpa/factory/package-info.java    | 2 +-
 .../apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java | 4 ++--
 .../olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java    | 2 +-
 .../olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java    | 2 +-
 .../odata2/processor/api/jpa/jpql/JPQLJoinContextView.java       | 2 +-
 .../processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java  | 2 +-
 .../odata2/processor/api/jpa/jpql/JPQLSelectContextView.java     | 2 +-
 .../processor/api/jpa/jpql/JPQLSelectSingleContextView.java      | 2 +-
 .../olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java      | 4 ++--
 .../olingo/odata2/processor/api/jpa/jpql/package-info.java       | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmAssociationView.java    | 2 +-
 .../olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java    | 2 +-
 .../processor/api/jpa/model/JPAEdmComplexPropertyView.java       | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java    | 2 +-
 .../processor/api/jpa/model/JPAEdmEntityContainerView.java       | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmEntitySetView.java      | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java     | 2 +-
 .../olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java   | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java | 2 +-
 .../olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java     | 2 +-
 .../olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java     | 2 +-
 .../olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java   | 2 +-
 .../processor/api/jpa/model/JPAEdmNavigationPropertyView.java    | 2 +-
 .../odata2/processor/api/jpa/model/JPAEdmPropertyView.java       | 2 +-
 .../api/jpa/model/JPAEdmReferentialConstraintRoleView.java       | 2 +-
 .../processor/api/jpa/model/JPAEdmReferentialConstraintView.java | 2 +-
 .../olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java  | 2 +-
 .../odata2/processor/api/jpa/model/mapping/package-info.java     | 2 +-
 .../olingo/odata2/processor/api/jpa/model/package-info.java      | 2 +-
 .../org/apache/olingo/odata2/processor/api/jpa/package-info.java | 2 +-
 .../olingo/odata2/processor/core/jpa/ODataExpressionParser.java  | 2 +-
 .../odata2/processor/core/jpa/access/model/JPATypeConvertor.java | 2 +-
 .../main/java/org/apache/olingo/odata2/api/ODataCallback.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/ODataDebugCallback.java    | 2 +-
 .../src/main/java/org/apache/olingo/odata2/api/ODataService.java | 2 +-
 .../java/org/apache/olingo/odata2/api/ODataServiceFactory.java   | 2 +-
 .../java/org/apache/olingo/odata2/api/ODataServiceVersion.java   | 2 +-
 .../java/org/apache/olingo/odata2/api/batch/BatchHandler.java    | 2 +-
 .../main/java/org/apache/olingo/odata2/api/batch/BatchPart.java  | 2 +-
 .../org/apache/olingo/odata2/api/batch/BatchResponsePart.java    | 4 ++--
 .../org/apache/olingo/odata2/api/commons/HttpContentType.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/commons/HttpHeaders.java   | 2 +-
 .../org/apache/olingo/odata2/api/commons/HttpStatusCodes.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/commons/InlineCount.java   | 2 +-
 .../org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java   | 2 +-
 .../org/apache/olingo/odata2/api/commons/ODataHttpMethod.java    | 2 +-
 .../src/main/java/org/apache/olingo/odata2/api/edm/Edm.java      | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmAction.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java    | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java   | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmAssociation.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java   | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmComplexType.java    | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java     | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmContentKind.java    | 2 +-
 .../olingo/odata2/api/edm/EdmCustomizableFeedMappings.java       | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmElement.java   | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmEntityContainer.java     | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java  | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmEntityType.java     | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmException.java | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java   | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmLiteralException.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java    | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java  | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java   | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java   | 2 +-
 .../src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java  | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java  | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java     | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java     | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java     | 2 +-
 .../src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java  | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java  | 2 +-
 .../src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java | 2 +-
 .../olingo/odata2/api/edm/provider/AnnotationAttribute.java      | 2 +-
 .../apache/olingo/odata2/api/edm/provider/AnnotationElement.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/Association.java   | 2 +-
 .../apache/olingo/odata2/api/edm/provider/AssociationEnd.java    | 2 +-
 .../apache/olingo/odata2/api/edm/provider/AssociationSet.java    | 2 +-
 .../apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java | 2 +-
 .../apache/olingo/odata2/api/edm/provider/ComplexProperty.java   | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/ComplexType.java   | 2 +-
 .../olingo/odata2/api/edm/provider/CustomizableFeedMappings.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/DataServices.java  | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/Documentation.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/EdmProvider.java   | 2 +-
 .../olingo/odata2/api/edm/provider/EdmProviderAccessor.java      | 2 +-
 .../olingo/odata2/api/edm/provider/EdmProviderFactory.java       | 2 +-
 .../apache/olingo/odata2/api/edm/provider/EntityContainer.java   | 2 +-
 .../olingo/odata2/api/edm/provider/EntityContainerInfo.java      | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/EntitySet.java     | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/EntityType.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/provider/Facets.java   | 2 +-
 .../apache/olingo/odata2/api/edm/provider/FunctionImport.java    | 2 +-
 .../olingo/odata2/api/edm/provider/FunctionImportParameter.java  | 2 +-
 .../main/java/org/apache/olingo/odata2/api/edm/provider/Key.java | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/provider/Mapping.java  | 2 +-
 .../olingo/odata2/api/edm/provider/NavigationProperty.java       | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/provider/Property.java | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/PropertyRef.java   | 2 +-
 .../olingo/odata2/api/edm/provider/ReferentialConstraint.java    | 2 +-
 .../odata2/api/edm/provider/ReferentialConstraintRole.java       | 2 +-
 .../org/apache/olingo/odata2/api/edm/provider/ReturnType.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/provider/Schema.java   | 2 +-
 .../apache/olingo/odata2/api/edm/provider/SimpleProperty.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/edm/provider/Using.java    | 2 +-
 .../java/org/apache/olingo/odata2/api/ep/EntityProvider.java     | 2 +-
 .../olingo/odata2/api/ep/EntityProviderBatchProperties.java      | 2 +-
 .../olingo/odata2/api/ep/EntityProviderReadProperties.java       | 4 ++--
 .../olingo/odata2/api/ep/callback/OnReadInlineContent.java       | 2 +-
 .../olingo/odata2/api/ep/callback/OnWriteEntryContent.java       | 2 +-
 .../apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java | 2 +-
 .../apache/olingo/odata2/api/ep/callback/ReadEntryResult.java    | 2 +-
 .../org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java | 2 +-
 .../org/apache/olingo/odata2/api/ep/callback/ReadResult.java     | 2 +-
 .../apache/olingo/odata2/api/ep/callback/TombstoneCallback.java  | 2 +-
 .../olingo/odata2/api/ep/callback/TombstoneCallbackResult.java   | 2 +-
 .../olingo/odata2/api/ep/callback/WriteCallbackContext.java      | 2 +-
 .../olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java | 2 +-
 .../olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java  | 2 +-
 .../olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java  | 2 +-
 .../olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java   | 2 +-
 .../java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java  | 2 +-
 .../java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java     | 2 +-
 .../org/apache/olingo/odata2/api/exception/MessageReference.java | 2 +-
 .../olingo/odata2/api/exception/ODataApplicationException.java   | 2 +-
 .../olingo/odata2/api/exception/ODataBadRequestException.java    | 2 +-
 .../olingo/odata2/api/exception/ODataConflictException.java      | 2 +-
 .../org/apache/olingo/odata2/api/exception/ODataException.java   | 2 +-
 .../olingo/odata2/api/exception/ODataForbiddenException.java     | 2 +-
 .../apache/olingo/odata2/api/exception/ODataHttpException.java   | 2 +-
 .../olingo/odata2/api/exception/ODataMessageException.java       | 2 +-
 .../odata2/api/exception/ODataMethodNotAllowedException.java     | 2 +-
 .../olingo/odata2/api/exception/ODataNotAcceptableException.java | 2 +-
 .../olingo/odata2/api/exception/ODataNotFoundException.java      | 2 +-
 .../odata2/api/exception/ODataNotImplementedException.java       | 2 +-
 .../odata2/api/exception/ODataPreconditionFailedException.java   | 2 +-
 .../odata2/api/exception/ODataPreconditionRequiredException.java | 2 +-
 .../odata2/api/exception/ODataServiceUnavailableException.java   | 2 +-
 .../odata2/api/exception/ODataUnsupportedMediaTypeException.java | 2 +-
 .../org/apache/olingo/odata2/api/processor/ODataContext.java     | 2 +-
 .../apache/olingo/odata2/api/processor/ODataErrorCallback.java   | 2 +-
 .../apache/olingo/odata2/api/processor/ODataErrorContext.java    | 2 +-
 .../org/apache/olingo/odata2/api/processor/ODataProcessor.java   | 2 +-
 .../org/apache/olingo/odata2/api/processor/ODataRequest.java     | 2 +-
 .../org/apache/olingo/odata2/api/processor/ODataResponse.java    | 4 ++--
 .../apache/olingo/odata2/api/processor/ODataSingleProcessor.java | 2 +-
 .../olingo/odata2/api/processor/feature/CustomContentType.java   | 2 +-
 .../odata2/api/processor/feature/ODataProcessorFeature.java      | 2 +-
 .../apache/olingo/odata2/api/processor/part/BatchProcessor.java  | 2 +-
 .../api/processor/part/EntityComplexPropertyProcessor.java       | 2 +-
 .../olingo/odata2/api/processor/part/EntityLinkProcessor.java    | 2 +-
 .../olingo/odata2/api/processor/part/EntityLinksProcessor.java   | 2 +-
 .../olingo/odata2/api/processor/part/EntityMediaProcessor.java   | 2 +-
 .../apache/olingo/odata2/api/processor/part/EntityProcessor.java | 2 +-
 .../olingo/odata2/api/processor/part/EntitySetProcessor.java     | 2 +-
 .../odata2/api/processor/part/EntitySimplePropertyProcessor.java | 2 +-
 .../api/processor/part/EntitySimplePropertyValueProcessor.java   | 2 +-
 .../odata2/api/processor/part/FunctionImportProcessor.java       | 2 +-
 .../odata2/api/processor/part/FunctionImportValueProcessor.java  | 2 +-
 .../olingo/odata2/api/processor/part/MetadataProcessor.java      | 2 +-
 .../odata2/api/processor/part/ServiceDocumentProcessor.java      | 2 +-
 .../java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java    | 2 +-
 .../org/apache/olingo/odata2/api/servicedocument/Accept.java     | 2 +-
 .../org/apache/olingo/odata2/api/servicedocument/AtomInfo.java   | 2 +-
 .../org/apache/olingo/odata2/api/servicedocument/Categories.java | 2 +-
 .../org/apache/olingo/odata2/api/servicedocument/Category.java   | 2 +-
 .../org/apache/olingo/odata2/api/servicedocument/Collection.java | 2 +-
 .../olingo/odata2/api/servicedocument/CommonAttributes.java      | 2 +-
 .../olingo/odata2/api/servicedocument/ExtensionAttribute.java    | 2 +-
 .../olingo/odata2/api/servicedocument/ExtensionElement.java      | 2 +-
 .../java/org/apache/olingo/odata2/api/servicedocument/Fixed.java | 2 +-
 .../olingo/odata2/api/servicedocument/ServiceDocument.java       | 2 +-
 .../olingo/odata2/api/servicedocument/ServiceDocumentParser.java | 2 +-
 .../api/servicedocument/ServiceDocumentParserException.java      | 2 +-
 .../java/org/apache/olingo/odata2/api/servicedocument/Title.java | 2 +-
 .../org/apache/olingo/odata2/api/servicedocument/Workspace.java  | 2 +-
 .../org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java   | 2 +-
 .../main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java | 2 +-
 .../apache/olingo/odata2/api/uri/NavigationPropertySegment.java  | 2 +-
 .../java/org/apache/olingo/odata2/api/uri/NavigationSegment.java | 2 +-
 .../src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java | 2 +-
 .../main/java/org/apache/olingo/odata2/api/uri/PathSegment.java  | 2 +-
 .../main/java/org/apache/olingo/odata2/api/uri/SelectItem.java   | 2 +-
 .../src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java  | 2 +-
 .../apache/olingo/odata2/api/uri/UriNotMatchingException.java    | 2 +-
 .../main/java/org/apache/olingo/odata2/api/uri/UriParser.java    | 2 +-
 .../org/apache/olingo/odata2/api/uri/UriSyntaxException.java     | 2 +-
 .../olingo/odata2/api/uri/expression/BinaryExpression.java       | 2 +-
 .../apache/olingo/odata2/api/uri/expression/BinaryOperator.java  | 2 +-
 .../olingo/odata2/api/uri/expression/CommonExpression.java       | 2 +-
 .../odata2/api/uri/expression/ExceptionVisitExpression.java      | 2 +-
 .../apache/olingo/odata2/api/uri/expression/ExpressionKind.java  | 2 +-
 .../odata2/api/uri/expression/ExpressionParserException.java     | 2 +-
 .../olingo/odata2/api/uri/expression/ExpressionVisitor.java      | 2 +-
 .../olingo/odata2/api/uri/expression/FilterExpression.java       | 2 +-
 .../olingo/odata2/api/uri/expression/LiteralExpression.java      | 2 +-
 .../olingo/odata2/api/uri/expression/MemberExpression.java       | 2 +-
 .../olingo/odata2/api/uri/expression/MethodExpression.java       | 2 +-
 .../apache/olingo/odata2/api/uri/expression/MethodOperator.java  | 2 +-
 .../olingo/odata2/api/uri/expression/OrderByExpression.java      | 2 +-
 .../apache/olingo/odata2/api/uri/expression/OrderExpression.java | 2 +-
 .../olingo/odata2/api/uri/expression/PropertyExpression.java     | 2 +-
 .../org/apache/olingo/odata2/api/uri/expression/SortOrder.java   | 2 +-
 .../apache/olingo/odata2/api/uri/expression/UnaryExpression.java | 2 +-
 .../apache/olingo/odata2/api/uri/expression/UnaryOperator.java   | 2 +-
 .../org/apache/olingo/odata2/api/uri/expression/Visitable.java   | 2 +-
 .../org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java     | 2 +-
 .../olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java    | 2 +-
 .../apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java | 2 +-
 .../olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java    | 2 +-
 .../apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java  | 2 +-
 .../olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java     | 2 +-
 .../odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java       | 2 +-
 .../olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java     | 2 +-
 .../apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java   | 2 +-
 .../org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java  | 2 +-
 .../olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java     | 2 +-
 .../olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java      | 2 +-
 .../apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java    | 2 +-
 .../olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java    | 2 +-
 .../olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java     | 2 +-
 .../java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java  | 2 +-
 .../apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java  | 2 +-
 .../java/org/apache/olingo/odata2/core/ContentNegotiator.java    | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/Dispatcher.java  | 2 +-
 .../java/org/apache/olingo/odata2/core/ODataContextImpl.java     | 2 +-
 .../org/apache/olingo/odata2/core/ODataExceptionWrapper.java     | 2 +-
 .../java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java | 2 +-
 .../java/org/apache/olingo/odata2/core/ODataRequestHandler.java  | 2 +-
 .../java/org/apache/olingo/odata2/core/ODataRequestImpl.java     | 2 +-
 .../java/org/apache/olingo/odata2/core/ODataResponseImpl.java    | 2 +-
 .../main/java/org/apache/olingo/odata2/core/PathInfoImpl.java    | 2 +-
 .../java/org/apache/olingo/odata2/core/batch/AcceptParser.java   | 2 +-
 .../org/apache/olingo/odata2/core/batch/BatchRequestParser.java  | 2 +-
 .../java/org/apache/olingo/odata2/core/commons/ContentType.java  | 2 +-
 .../main/java/org/apache/olingo/odata2/core/commons/Decoder.java | 2 +-
 .../main/java/org/apache/olingo/odata2/core/commons/Encoder.java | 2 +-
 .../main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java | 2 +-
 .../java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java  | 2 +-
 .../org/apache/olingo/odata2/core/debug/DebugInfoException.java  | 2 +-
 .../org/apache/olingo/odata2/core/debug/DebugInfoRequest.java    | 2 +-
 .../org/apache/olingo/odata2/core/debug/DebugInfoResponse.java   | 2 +-
 .../org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java    | 2 +-
 .../java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java   | 2 +-
 .../olingo/odata2/core/debug/ODataDebugResponseWrapper.java      | 2 +-
 .../org/apache/olingo/odata2/core/edm/AbstractSimpleType.java    | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/edm/Bit.java     | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java   | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java  | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java | 2 +-
 .../org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java     | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java  | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java   | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java    | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java    | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java    | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java    | 2 +-
 .../apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java   | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java   | 2 +-
 .../main/java/org/apache/olingo/odata2/core/edm/EdmString.java   | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java   | 2 +-
 .../odata2/core/edm/provider/EdmComplexPropertyImplProv.java     | 2 +-
 .../olingo/odata2/core/edm/provider/EdmElementImplProv.java      | 2 +-
 .../odata2/core/edm/provider/EdmEntityContainerImplProv.java     | 2 +-
 .../odata2/core/edm/provider/EdmFunctionImportImplProv.java      | 2 +-
 .../olingo/odata2/core/edm/provider/EdmParameterImplProv.java    | 2 +-
 .../odata2/core/edm/provider/EdmServiceMetadataImplProv.java     | 2 +-
 .../odata2/core/edm/provider/EdmStructuralTypeImplProv.java      | 2 +-
 .../apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java | 2 +-
 .../org/apache/olingo/odata2/core/ep/AtomEntityProvider.java     | 2 +-
 .../org/apache/olingo/odata2/core/ep/BasicEntityProvider.java    | 2 +-
 .../olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java    | 2 +-
 .../org/apache/olingo/odata2/core/ep/JsonEntityProvider.java     | 2 +-
 .../org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java     | 2 +-
 .../olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java   | 2 +-
 .../olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java     | 2 +-
 .../olingo/odata2/core/ep/aggregator/EntityTypeMapping.java      | 2 +-
 .../olingo/odata2/core/ep/consumer/JsonEntityConsumer.java       | 2 +-
 .../apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java | 2 +-
 .../apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java  | 2 +-
 .../apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java  | 2 +-
 .../olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java     | 2 +-
 .../odata2/core/ep/consumer/JsonServiceDocumentConsumer.java     | 2 +-
 .../apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java | 2 +-
 .../apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java  | 2 +-
 .../apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java   | 2 +-
 .../apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java   | 2 +-
 .../olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java      | 2 +-
 .../apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java    | 2 +-
 .../apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java    | 2 +-
 .../org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java   | 2 +-
 .../olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java  | 2 +-
 .../apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java  | 2 +-
 .../odata2/core/ep/producer/AtomServiceDocumentProducer.java     | 2 +-
 .../odata2/core/ep/producer/JsonCollectionEntityProducer.java    | 2 +-
 .../olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java  | 2 +-
 .../odata2/core/ep/producer/JsonErrorDocumentProducer.java       | 2 +-
 .../olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java   | 2 +-
 .../olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java   | 2 +-
 .../olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java  | 2 +-
 .../odata2/core/ep/producer/JsonPropertyEntityProducer.java      | 2 +-
 .../odata2/core/ep/producer/JsonServiceDocumentProducer.java     | 2 +-
 .../apache/olingo/odata2/core/ep/producer/TombstoneProducer.java | 2 +-
 .../odata2/core/ep/producer/XmlCollectionEntityProducer.java     | 2 +-
 .../olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java    | 2 +-
 .../olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java   | 2 +-
 .../odata2/core/ep/producer/XmlPropertyEntityProducer.java       | 2 +-
 .../apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java    | 2 +-
 .../java/org/apache/olingo/odata2/core/ep/util/FormatJson.java   | 2 +-
 .../java/org/apache/olingo/odata2/core/ep/util/FormatXml.java    | 2 +-
 .../org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java  | 2 +-
 .../org/apache/olingo/odata2/core/exception/MessageService.java  | 2 +-
 .../olingo/odata2/core/exception/ODataRuntimeException.java      | 2 +-
 .../odata2/core/processor/ODataSingleProcessorService.java       | 2 +-
 .../apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java | 2 +-
 .../org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java | 2 +-
 .../org/apache/olingo/odata2/core/rest/ODataRootLocator.java     | 2 +-
 .../java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java | 2 +-
 .../main/java/org/apache/olingo/odata2/core/rest/RestUtil.java   | 2 +-
 .../org/apache/olingo/odata2/core/rest/SubLocatorParameter.java  | 2 +-
 .../org/apache/olingo/odata2/core/rest/app/ODataApplication.java | 2 +-
 .../org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java    | 2 +-
 .../apache/olingo/odata2/core/servicedocument/AcceptImpl.java    | 2 +-
 .../apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java  | 2 +-
 .../olingo/odata2/core/servicedocument/CategoriesImpl.java       | 2 +-
 .../apache/olingo/odata2/core/servicedocument/CategoryImpl.java  | 2 +-
 .../olingo/odata2/core/servicedocument/CollectionImpl.java       | 2 +-
 .../olingo/odata2/core/servicedocument/CommonAttributesImpl.java | 2 +-
 .../odata2/core/servicedocument/ExtensionAttributeImpl.java      | 2 +-
 .../olingo/odata2/core/servicedocument/ExtensionElementImpl.java | 2 +-
 .../olingo/odata2/core/servicedocument/ServiceDocumentImpl.java  | 2 +-
 .../org/apache/olingo/odata2/core/servicedocument/TitleImpl.java | 2 +-
 .../apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java | 2 +-
 .../apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java   | 2 +-
 .../apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java  | 2 +-
 .../java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java | 2 +-
 .../olingo/odata2/core/uri/NavigationPropertySegmentImpl.java    | 2 +-
 .../org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java | 2 +-
 .../java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java   | 2 +-
 .../org/apache/olingo/odata2/core/uri/SystemQueryOption.java     | 2 +-
 .../main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java | 2 +-
 .../java/org/apache/olingo/odata2/core/uri/UriParserImpl.java    | 2 +-
 .../src/main/java/org/apache/olingo/odata2/core/uri/UriType.java | 2 +-
 .../olingo/odata2/core/uri/expression/BinaryExpressionImpl.java  | 2 +-
 .../core/uri/expression/ExpressionParserInternalError.java       | 2 +-
 .../olingo/odata2/core/uri/expression/FilterExpressionImpl.java  | 2 +-
 .../apache/olingo/odata2/core/uri/expression/FilterParser.java   | 2 +-
 .../odata2/core/uri/expression/FilterParserExceptionImpl.java    | 2 +-
 .../olingo/odata2/core/uri/expression/FilterParserImpl.java      | 2 +-
 .../olingo/odata2/core/uri/expression/InfoBinaryOperator.java    | 2 +-
 .../org/apache/olingo/odata2/core/uri/expression/InfoMethod.java | 2 +-
 .../olingo/odata2/core/uri/expression/InfoUnaryOperator.java     | 2 +-
 .../apache/olingo/odata2/core/uri/expression/JsonVisitor.java    | 2 +-
 .../olingo/odata2/core/uri/expression/MemberExpressionImpl.java  | 2 +-
 .../olingo/odata2/core/uri/expression/MethodExpressionImpl.java  | 2 +-
 .../olingo/odata2/core/uri/expression/OrderByExpressionImpl.java | 2 +-
 .../apache/olingo/odata2/core/uri/expression/OrderByParser.java  | 2 +-
 .../olingo/odata2/core/uri/expression/OrderExpressionImpl.java   | 2 +-
 .../apache/olingo/odata2/core/uri/expression/ParameterSet.java   | 2 +-
 .../org/apache/olingo/odata2/core/uri/expression/Tokenizer.java  | 2 +-
 .../olingo/odata2/core/uri/expression/TokenizerException.java    | 2 +-
 .../olingo/odata2/core/uri/expression/TokenizerExpectError.java  | 2 +-
 .../olingo/odata2/core/uri/expression/TokenizerRTException.java  | 2 +-
 .../olingo/odata2/core/uri/expression/UnaryExpressionImpl.java   | 2 +-
 .../org/apache/olingo/odata2/core/ContentNegotiatorTest.java     | 2 +-
 .../test/java/org/apache/olingo/odata2/core/DispatcherTest.java  | 2 +-
 .../java/org/apache/olingo/odata2/core/ODataContextImplTest.java | 2 +-
 .../org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java | 2 +-
 .../olingo/odata2/core/ODataRequestHandlerValidationTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/core/ODataResponseTest.java    | 2 +-
 .../test/java/org/apache/olingo/odata2/core/PathSegmentTest.java | 2 +-
 .../apache/olingo/odata2/core/batch/BatchRequestParserTest.java  | 2 +-
 .../org/apache/olingo/odata2/core/commons/ContentTypeTest.java   | 2 +-
 .../java/org/apache/olingo/odata2/core/commons/DecoderTest.java  | 2 +-
 .../java/org/apache/olingo/odata2/core/commons/EncoderTest.java  | 2 +-
 .../org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java   | 2 +-
 .../olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java  | 2 +-
 .../test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java | 2 +-
 .../apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java   | 2 +-
 .../org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java     | 2 +-
 .../odata2/core/edm/provider/EdmAssociationEndImplProvTest.java  | 2 +-
 .../odata2/core/edm/provider/EdmAssociationImplProvTest.java     | 2 +-
 .../odata2/core/edm/provider/EdmComplexTypeImplProvTest.java     | 2 +-
 .../odata2/core/edm/provider/EdmEntityContainerImplProvTest.java | 2 +-
 .../olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java    | 2 +-
 .../odata2/core/edm/provider/EdmEntityTypeImplProvTest.java      | 2 +-
 .../odata2/core/edm/provider/EdmFunctionImportImplProvTest.java  | 2 +-
 .../core/edm/provider/EdmNavigationPropertyImplProvTest.java     | 2 +-
 .../olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java | 2 +-
 .../odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java | 2 +-
 .../org/apache/olingo/odata2/core/ep/AbstractProviderTest.java   | 2 +-
 .../java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java | 2 +-
 .../org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java     | 2 +-
 .../olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java | 2 +-
 .../java/org/apache/olingo/odata2/core/ep/PerformanceTest.java   | 2 +-
 .../org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java | 2 +-
 .../odata2/core/ep/aggregator/EntityInfoAggregatorTest.java      | 2 +-
 .../olingo/odata2/core/ep/consumer/AbstractConsumerTest.java     | 2 +-
 .../odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java | 2 +-
 .../olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java    | 2 +-
 .../odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java     | 2 +-
 .../olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java     | 2 +-
 .../olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java     | 2 +-
 .../olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java | 2 +-
 .../olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java    | 2 +-
 .../olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java      | 2 +-
 .../olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java  | 2 +-
 .../olingo/odata2/core/ep/producer/AtomEntryProducerTest.java    | 2 +-
 .../olingo/odata2/core/ep/producer/AtomFeedProducerTest.java     | 2 +-
 .../odata2/core/ep/producer/JsonEntryEntityProducerTest.java     | 2 +-
 .../olingo/odata2/core/ep/producer/JsonErrorProducerTest.java    | 2 +-
 .../odata2/core/ep/producer/JsonFeedEntityProducerTest.java      | 2 +-
 .../olingo/odata2/core/ep/producer/JsonFunctionImportTest.java   | 2 +-
 .../odata2/core/ep/producer/JsonLinkEntityProducerTest.java      | 2 +-
 .../odata2/core/ep/producer/JsonLinksEntityProducerTest.java     | 2 +-
 .../olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java | 2 +-
 .../odata2/core/ep/producer/JsonServiceDocumentProducerTest.java | 2 +-
 .../org/apache/olingo/odata2/core/ep/producer/MyCallback.java    | 2 +-
 .../olingo/odata2/core/ep/producer/XmlErrorProducerTest.java     | 2 +-
 .../olingo/odata2/core/ep/producer/XmlFunctionImportTest.java    | 2 +-
 .../odata2/core/ep/producer/XmlLinkEntityProducerTest.java       | 2 +-
 .../odata2/core/ep/producer/XmlLinksEntityProducerTest.java      | 2 +-
 .../olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java  | 2 +-
 .../olingo/odata2/core/ep/producer/XmlSelectProducerTest.java    | 2 +-
 .../olingo/odata2/core/ep/util/CircleStreamBufferTest.java       | 2 +-
 .../apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java  | 2 +-
 .../olingo/odata2/core/exception/MessageReferenceTest.java       | 2 +-
 .../apache/olingo/odata2/core/exception/MessageServiceTest.java  | 2 +-
 .../apache/olingo/odata2/core/exception/ODataExceptionTest.java  | 2 +-
 .../odata2/core/exception/ODataMessageTextVerifierTest.java      | 2 +-
 .../odata2/core/processor/ODataSingleProcessorServiceTest.java   | 2 +-
 .../olingo/odata2/core/rest/ODataExceptionMapperImplTest.java    | 2 +-
 .../olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java  | 2 +-
 .../org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java  | 2 +-
 .../test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java | 2 +-
 .../org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java   | 2 +-
 .../java/org/apache/olingo/odata2/core/uri/UriParserTest.java    | 2 +-
 .../olingo/odata2/core/uri/expression/FilterParserImplTool.java  | 2 +-
 .../olingo/odata2/core/uri/expression/FilterToJsonTest.java      | 2 +-
 .../org/apache/olingo/odata2/core/uri/expression/ParserTool.java | 2 +-
 .../olingo/odata2/core/uri/expression/TestAbapCompatibility.java | 2 +-
 .../org/apache/olingo/odata2/core/uri/expression/TestBase.java   | 2 +-
 .../olingo/odata2/core/uri/expression/TestExceptionTexts.java    | 2 +-
 .../org/apache/olingo/odata2/core/uri/expression/TestParser.java | 2 +-
 .../olingo/odata2/core/uri/expression/TestParserExceptions.java  | 2 +-
 .../org/apache/olingo/odata2/core/uri/expression/TestSpec.java   | 2 +-
 .../org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java    | 2 +-
 .../org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java | 2 +-
 .../java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java  | 2 +-
 .../java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java   | 2 +-
 .../odata2/fit/basic/ContentNegotiationDollarFormatTest.java     | 2 +-
 .../java/org/apache/olingo/odata2/fit/basic/ContextTest.java     | 2 +-
 .../org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java  | 2 +-
 .../java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java     | 2 +-
 .../olingo/odata2/fit/basic/HttpExceptionResponseTest.java       | 2 +-
 .../apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java  | 2 +-
 .../java/org/apache/olingo/odata2/fit/basic/MetadataTest.java    | 2 +-
 .../apache/olingo/odata2/fit/basic/RequestContentTypeTest.java   | 2 +-
 .../apache/olingo/odata2/fit/basic/ServiceResolutionTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java  | 2 +-
 .../org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java  | 2 +-
 .../java/org/apache/olingo/odata2/fit/mapping/MapFactory.java    | 2 +-
 .../java/org/apache/olingo/odata2/fit/mapping/MappingTest.java   | 2 +-
 .../org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java   | 2 +-
 .../org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java     | 2 +-
 .../test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java    | 2 +-
 .../org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java | 2 +-
 .../org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java | 2 +-
 .../org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java    | 2 +-
 .../apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java  | 2 +-
 .../org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java    | 2 +-
 .../org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java  | 2 +-
 .../org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java     | 2 +-
 .../org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java     | 2 +-
 .../org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java   | 2 +-
 .../org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java   | 2 +-
 .../org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java    | 2 +-
 .../org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java | 2 +-
 .../org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java  | 2 +-
 .../org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java    | 2 +-
 .../org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java  | 2 +-
 .../org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java     | 2 +-
 .../org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java   | 2 +-
 .../test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java | 2 +-
 .../java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java  | 2 +-
 .../org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java | 2 +-
 .../apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java   | 2 +-
 .../org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java  | 2 +-
 .../apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java   | 2 +-
 .../java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java    | 2 +-
 .../ref/contentnegotiation/AbstractContentNegotiationTest.java   | 2 +-
 .../ref/contentnegotiation/ContentNegotiationGetRequestTest.java | 2 +-
 .../contentnegotiation/ContentNegotiationPostRequestTest.java    | 2 +-
 .../org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java    | 2 +-
 .../main/java/org/apache/olingo/odata2/ref/model/Building.java   | 2 +-
 .../src/main/java/org/apache/olingo/odata2/ref/model/City.java   | 2 +-
 .../java/org/apache/olingo/odata2/ref/model/DataContainer.java   | 2 +-
 .../main/java/org/apache/olingo/odata2/ref/model/Employee.java   | 2 +-
 .../main/java/org/apache/olingo/odata2/ref/model/Location.java   | 2 +-
 .../main/java/org/apache/olingo/odata2/ref/model/Manager.java    | 2 +-
 .../java/org/apache/olingo/odata2/ref/model/ModelException.java  | 2 +-
 .../src/main/java/org/apache/olingo/odata2/ref/model/Photo.java  | 2 +-
 .../src/main/java/org/apache/olingo/odata2/ref/model/Room.java   | 2 +-
 .../src/main/java/org/apache/olingo/odata2/ref/model/Team.java   | 2 +-
 .../org/apache/olingo/odata2/ref/processor/ListsDataSource.java  | 2 +-
 .../org/apache/olingo/odata2/ref/processor/ListsProcessor.java   | 2 +-
 .../apache/olingo/odata2/ref/processor/ScenarioDataSource.java   | 2 +-
 .../olingo/odata2/ref/processor/ScenarioErrorCallback.java       | 2 +-
 .../olingo/odata2/ref/processor/ScenarioServiceFactory.java      | 2 +-
 .../java/org/apache/olingo/odata2/ref/model/BuildingTest.java    | 2 +-
 .../org/apache/olingo/odata2/ref/model/DataContainerTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/ref/model/EmployeeTest.java    | 2 +-
 .../java/org/apache/olingo/odata2/ref/model/ManagerTest.java     | 2 +-
 .../test/java/org/apache/olingo/odata2/ref/model/RoomTest.java   | 2 +-
 .../test/java/org/apache/olingo/odata2/ref/model/TeamTest.java   | 2 +-
 .../java/org/apache/olingo/odata2/ref/read/EntitySetTest.java    | 2 +-
 .../test/java/org/apache/olingo/odata2/ref/read/EntityTest.java  | 2 +-
 .../apache/olingo/odata2/testutil/TestUtilRuntimeException.java  | 2 +-
 .../org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java   | 2 +-
 .../java/org/apache/olingo/odata2/testutil/fit/BaseTest.java     | 2 +-
 .../org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java  | 2 +-
 .../olingo/odata2/testutil/fit/FitStaticServiceFactory.java      | 2 +-
 .../org/apache/olingo/odata2/testutil/helper/ClassHelper.java    | 2 +-
 .../olingo/odata2/testutil/helper/ODataMessageTextVerifier.java  | 2 +-
 .../org/apache/olingo/odata2/testutil/helper/ProcessLocker.java  | 2 +-
 .../org/apache/olingo/odata2/testutil/helper/StringHelper.java   | 2 +-
 .../org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java  | 2 +-
 .../java/org/apache/olingo/odata2/testutil/mock/EdmMock.java     | 2 +-
 .../java/org/apache/olingo/odata2/testutil/mock/MockFacade.java  | 2 +-
 .../testutil/mock/SampleClassForInvalidMessageReferences.java    | 2 +-
 .../java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java  | 2 +-
 .../odata2/testutil/mock/TechnicalScenarioEdmProvider.java       | 2 +-
 .../olingo/odata2/testutil/server/ServerRuntimeException.java    | 2 +-
 .../org/apache/olingo/odata2/testutil/server/TestServer.java     | 2 +-
 582 files changed, 589 insertions(+), 589 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
index fc56f83..f1cdf70 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAContext.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmExtension;
  * <li>An instance of Java Persistence Entity Manager Factory</li>
  * </ol>
  * 
- * @author <br>
+ *   <br>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAAccessFactory

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
index 7feb1b5..d97bfd4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  * Extend this class and implement an OData JPA processor if the default
  * behavior of OData JPA Processor library has to be overwritten.
  * 
- * @author
+ *  
  * 
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
index bbb6660..30d7f1c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmBuilder.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
  * JPAEdmBuilder interface provides methods for building elements of an Entity Data Model (EDM) from
  * a Java Persistence Model.
  * 
- * @author
+ *  
  * 
  */
 public interface JPAEdmBuilder {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
index 9e07ba5..0c8601a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingMod
 /**
  * Interface provides methods to access JPA EDM mapping model.
  * 
- * @author
+ *  
  * @see JPAEdmMappingModel
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
index 6521ace..6ddf274 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
@@ -28,7 +28,7 @@ import java.lang.reflect.Type;
  * <li>Custom Operation (Annotated with EDM Annotation FunctionImport)</li>
  * </ol>
  * 
- * @author
+ *  
  * 
  */
 public class JPAFunction {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
index 224157f..b65605d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
@@ -29,7 +29,7 @@ package org.apache.olingo.odata2.processor.api.jpa.access;
  * </ol>
  * </b>
  * 
- * @author
+ *  
  * 
  */
 public class JPAJoinClause {
@@ -43,7 +43,7 @@ public class JPAJoinClause {
    * <li>INNER - inner join
    * </ol>
    * 
-   * @author
+   *  
    * 
    */
   public enum JOIN {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
index a6a09e8..d7a091a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
  * executing operations on JPA Entity/Custom processor objects. <br>
  * A default implementation is provided by the library.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.access.JPAMethodContextView
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
  * 
@@ -98,7 +98,7 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
    * The abstract class is extended by specific JPA Method Context Builder to
    * build JPA Method Context types.
    * 
-   * @author
+   *  
    * 
    */
   public static abstract class JPAMethodContextBuilder {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
index f37c172..fab588f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContextView.java
@@ -24,7 +24,7 @@ import java.util.List;
  * The interface provides view on JPA Method Context. JPA Method context can be
  * used to access custom operations or JPA Entity property access methods.
  * 
- * @author
+ *  
  * 
  */
 public interface JPAMethodContextView {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
index 2968337..a5e12a5 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
  * You need to pass the OData request and the API created a JPA response. The JPA response is a JPA entity. 
  * You can now work with the JPA entities directly once it is retrieved from the persistence.
  * 
- * @author
+ *  
  */
 public interface JPAProcessor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorRegistry.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorRegistry.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorRegistry.java
index 96c3244..57ea227 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorRegistry.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorRegistry.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.processor.api.jpa.access;
 
 /**
  * 
- * @author
+ *  
  *
  */
 public class JPAProcessorRegistry {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
index dbe160b..de90b3c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/package-info.java
@@ -20,7 +20,7 @@
  * <h3>OData JPA Processor API Library - Java Persistence Access</h3>
  * The library provides a set of APIs to access Java Persistence Models and Data.
  * 
- * @author
+ *  
  */
 package org.apache.olingo.odata2.processor.api.jpa.access;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
index 4277112..d6e622f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
  * provides non localized error texts that can be used for raising OData JPA
  * exceptions with non localized error texts.
  * 
- * @author
+ *  
  * 
  */
 public abstract class ODataJPAException extends ODataException {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
index bbccb2f..1a728e2 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAMessageService.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
  * not found for the given language then the default language -EN is used for
  * the message texts.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAException
  * @see org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException
  * @see org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
index 1f5275e..a7d77db 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  * The exception is thrown for any unexpected errors raising while
  * accessing/transforming Java Persistence Models.
  * 
- * @author
+ *  
  * 
  */
 public class ODataJPAModelException extends ODataJPAException {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
index be5b6b1..a83c9fe 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  * The exception object is created with localized error texts provided error
  * texts are maintained in localized languages.
  * 
- * @author
+ *  
  * 
  */
 public class ODataJPARuntimeException extends ODataJPAException {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
index 8d94a81..68c149b 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/package-info.java
@@ -25,7 +25,7 @@
  * The Model Exception is thrown while processing JPA metamodels and 
  * runtime exception is thrown while processing persistence data.
  * 
- * @author
+ *  
  */
 package org.apache.olingo.odata2.processor.api.jpa.exception;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
index df600cd..aef4337 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView;
  * <li>JPA Processor</li>
  * </ol>
  * 
- * @author
+ *  
  * 
  */
 public interface JPAAccessFactory {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
index 8c4a827..526c33d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStateme
  * </ul>
  * </p>
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
  */
 public interface JPQLBuilderFactory {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
index 3d8f47d..3b2e444 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAMessageServi
  * </ul>
  * </p>
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
  */
 public interface ODataJPAAccessFactory {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
index f070b4d..6888ec8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAFactory.java
@@ -32,7 +32,7 @@ package org.apache.olingo.odata2.processor.api.jpa.factory;
  * factory implementation.
  * <p>
  * 
- * @author
+ *  
  * 
  * 
  * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
index a9303fa..5de70c9 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/package-info.java
@@ -27,7 +27,7 @@
  * 
  * The instances of these factories can be obtained from an abstract ODataJPAFactory.
  * 
- * @author
+ *  
  */
 package org.apache.olingo.odata2.processor.api.jpa.factory;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
index d380786..a24402b 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  * built can be used for constructing JPQL statements. <br>
  * A default implementation is provided by the library.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory
@@ -131,7 +131,7 @@ public abstract class JPQLContext implements JPQLContextView {
    * The abstract class is extended by specific JPQLContext builder for
    * building JPQLContexts.
    * 
-   * @author
+   *  
    * 
    */
   public static abstract class JPQLContextBuilder {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
index 5991bd4..d1a0590 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextType.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.processor.api.jpa.jpql;
 /**
  * Enumerated list of JPQL context Types.
  * 
- * @author
+ *  
  * 
  */
 public enum JPQLContextType {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
index 974fae0..1cd0071 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContextView.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.processor.api.jpa.jpql;
  * The interface provides a view on JPQL Context. The view can be used to access
  * different JPQL context type implementations.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
index 43fb342..176b093 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinContextView.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
  * clauses to the Select statement. The JPQL Join context view is built from
  * OData read entity set with navigation request.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectContextView
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
index 2659899..03d32c7 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
  * any WHERE,ORDERBY clauses. The clauses are built from OData read entity
  * request views.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectSingleContextView
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
index e6a1e7a..729a095 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectContextView.java
@@ -26,7 +26,7 @@ import java.util.HashMap;
  * "ORDERBY", "WHERE". The clauses are built from OData read entity set request
  * views. The clauses thus built can be used for building JPQL Statements.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
index a328bba..9222943 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLSelectSingleContextView.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.KeyPredicate;
  * WHERE,JOIN,ORDERBY clauses. The clauses are built from OData read entity
  * request views.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
  * 
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
index acd74dd..f8736ca 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  * kinds of JPQL statements are built. 
  * The JPQL statements thus generated can be executed using JPA Query APIs to fetch JPA entities.
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView
  */
@@ -81,7 +81,7 @@ public class JPQLStatement {
    * A default statement builder for building each kind of JPQL statements is
    * provided by the library.
    * 
-   * @author
+   *  
    * 
    */
   public static abstract class JPQLStatementBuilder {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
index f5f067f..e385c23 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/package-info.java
@@ -21,7 +21,7 @@
  * The library provides set of APIs for building JPQL contexts from OData Requests.
  * The JPQL contexts thus built can be used for building JPQL Statements.
  * 
- * @author
+ *  
  */
 package org.apache.olingo.odata2.processor.api.jpa.jpql;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
index deceec9..01749b2 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationEndView.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
  * as a container for Association Ends.
  * </p>
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
index 4ae2324..d95a528 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationSetView.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.edm.provider.AssociationSet;
  * container for list of association sets that are consistent.
  * </p>
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
index 87712f3..9420ae0 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.api.edm.provider.Association;
  * </ol>
  * </p>
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
index 940223a..66dbc73 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAcces
  * The implementation of the view acts as a base container for containers of
  * Java Persistence Model and Entity Data Model elements.
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
index 5c19af2..9e13552 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
  * container for the properties of EDM complex type.
  * </p>
  * 
- * @author
+ *  
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView
  */
 public interface JPAEdmComplexPropertyView extends JPAEdmBaseView {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
index e8ecf2b..34d240a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.edm.provider.Property;
  * complex types. An EDM complex type is said to be consistent only if it used
  * in at least one of the EDM entity type.
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
index c4e8dcb..dcc4e60 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.edm.provider.EntityContainer;
  * container is said to be consistent only if the JPA EDM association set and
  * JPA EDM Entity Set view are consistent.
  * 
- * @author
+ *  
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
index 67f513e..6fa6414 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.edm.provider.EntitySet;
  * of EDM entity sets. An EDM entity set is said to be consistent only if it has
  * consistent EDM entity types.
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
index 3bc2272..a4c1869 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.edm.provider.EntityType;
  * entity types. An EDM entity type is said to be consistent only if it has at
  * least one consistent EDM property and at least one consistent EDM key.
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
index 90d04d0..a1917d1 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.processor.api.jpa.model;
 /**
  * The interface provides methods to extend JPA EDM containers.
  * 
- * @author
+ *  
  * 
  */
 public interface JPAEdmExtension {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
index a93a54b..4acab6d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImport;
  * function imports that are consistent.
  * </p>
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
index 7220ee3..f1cc104 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.edm.provider.Key;
  * given JPA EDM entity type. The view acts as a container for consistent EDM
  * key property of an EDM entity type.
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
index 6ec65e9..04bb102 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.processor.api.jpa.model;
  * JPA EDM mapping instance can be associated with any EDM simple, EDM complex
  * property to denote the properties Java persistence column name.
  * 
- * @author
+ *  
  * 
  */
 public interface JPAEdmMapping {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
index 142f706..480bb2f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
@@ -29,7 +29,7 @@ package org.apache.olingo.odata2.processor.api.jpa.model;
  * meta model using
  * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}.
  * 
- * @author
+ *  
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
index 3d42971..cc5bafd 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.api.edm.provider.NavigationProperty;
  * list of EDM navigation properties of an EDM entity type. EDM navigation
  * property is consistent only if there exists a consistent EDM association.
  * 
- * @author
+ *  
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
  * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
index 733f051..ccad965 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
@@ -42,7 +42,7 @@ import org.apache.olingo.odata2.api.edm.provider.SimpleProperty;
  * exists at least one property in the entity type and there is at least one key
  * property.
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView


[10/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
index 2abc0c8..8708fd4 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
@@ -80,22 +80,13 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
     final Schema schema = new Schema();
     schema.setNamespace(NAMESPACE_1);
 
-    schema.setEntityTypes(Arrays.asList(
-        getEntityType(ET_KEY_IS_STRING),
-        getEntityType(ET_KEY_IS_INTEGER),
-        getEntityType(ET_COMPLEX_KEY),
-        getEntityType(ET_ALL_TYPES)));
+    schema.setEntityTypes(Arrays.asList(getEntityType(ET_KEY_IS_STRING), getEntityType(ET_KEY_IS_INTEGER), getEntityType(ET_COMPLEX_KEY), getEntityType(ET_ALL_TYPES)));
 
     schema.setComplexTypes(Arrays.asList(getComplexType(CT_ALL_TYPES)));
 
     final EntityContainer entityContainer = new EntityContainer();
     entityContainer.setName(ENTITY_CONTAINER_1).setDefaultEntityContainer(true);
-    entityContainer.setEntitySets(Arrays.asList(
-        getEntitySet(ENTITY_CONTAINER_1, ES_KEY_IS_STRING),
-        getEntitySet(ENTITY_CONTAINER_1, ES_KEY_IS_INTEGER),
-        getEntitySet(ENTITY_CONTAINER_1, ES_COMPLEX_KEY),
-        getEntitySet(ENTITY_CONTAINER_1, ES_ALL_TYPES),
-        getEntitySet(ENTITY_CONTAINER_1, ES_STRING_FACETS)));
+    entityContainer.setEntitySets(Arrays.asList(getEntitySet(ENTITY_CONTAINER_1, ES_KEY_IS_STRING), getEntitySet(ENTITY_CONTAINER_1, ES_KEY_IS_INTEGER), getEntitySet(ENTITY_CONTAINER_1, ES_COMPLEX_KEY), getEntitySet(ENTITY_CONTAINER_1, ES_ALL_TYPES), getEntitySet(ENTITY_CONTAINER_1, ES_STRING_FACETS)));
 
     schema.setEntityContainers(Arrays.asList(entityContainer));
 
@@ -104,48 +95,32 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
 
   @Override
   public EntityType getEntityType(final FullQualifiedName edmFQName) throws ODataMessageException {
-    if (NAMESPACE_1.equals(edmFQName.getNamespace()))
-    {
-      if (ET_KEY_IS_STRING.getName().equals(edmFQName.getName()))
-      {
+    if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
+      if (ET_KEY_IS_STRING.getName().equals(edmFQName.getName())) {
         final List<Property> properties = new ArrayList<Property>();
-        properties.add(new SimpleProperty().setName("KeyString")
-            .setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setNullable(false)));
+        properties.add(new SimpleProperty().setName("KeyString").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setNullable(false)));
 
         final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
 
         navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_1).setToRole(ROLE_2).setRelationship(ASSOCIATION_ET1_ET2));
 
         return new EntityType().setName(ET_KEY_IS_STRING.getName()).setProperties(properties).setNavigationProperties(navigationProperties).setKey(createKey("KeyString"));
-      }
-      else if (ET_KEY_IS_INTEGER.getName().equals(edmFQName.getName()))
-      {
+      } else if (ET_KEY_IS_INTEGER.getName().equals(edmFQName.getName())) {
         final List<Property> properties = new ArrayList<Property>();
-        properties.add(new SimpleProperty().setName("KeyInteger")
-            .setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setNullable(false)));
+        properties.add(new SimpleProperty().setName("KeyInteger").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setNullable(false)));
 
         final List<NavigationProperty> navigationProperties = new ArrayList<NavigationProperty>();
         navigationProperties.add(new NavigationProperty().setName("navProperty").setFromRole(ROLE_2).setToRole(ROLE_1).setRelationship(ASSOCIATION_ET1_ET2));
 
         return new EntityType().setName(ET_KEY_IS_INTEGER.getName()).setProperties(properties).setNavigationProperties(navigationProperties).setKey(createKey("KeyInteger"));
 
-      }
-      else if (ET_COMPLEX_KEY.getName().equals(edmFQName.getName()))
-      {
+      } else if (ET_COMPLEX_KEY.getName().equals(edmFQName.getName())) {
         final List<Property> properties = new ArrayList<Property>();
-        properties.add(new SimpleProperty().setName("KeyString")
-            .setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setNullable(false)));
-        properties.add(new SimpleProperty().setName("KeyInteger")
-            .setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setNullable(false)));
+        properties.add(new SimpleProperty().setName("KeyString").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setNullable(false)));
+        properties.add(new SimpleProperty().setName("KeyInteger").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setNullable(false)));
 
         return new EntityType().setName(ET_COMPLEX_KEY.getName()).setProperties(properties).setKey(createKey("KeyInteger", "KeyString"));
-      }
-      else if (ET_ALL_TYPES.getName().equals(edmFQName.getName()))
-      {
+      } else if (ET_ALL_TYPES.getName().equals(edmFQName.getName())) {
         final List<Property> properties = new ArrayList<Property>();
         properties.add(new SimpleProperty().setName("Boolean").setType(EdmSimpleTypeKind.Boolean));
         properties.add(new SimpleProperty().setName("Binary").setType(EdmSimpleTypeKind.Binary));
@@ -164,28 +139,20 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
         properties.add(new SimpleProperty().setName("Time").setType(EdmSimpleTypeKind.Time));
         properties.add(new ComplexProperty().setName("Complex").setType(CT_ALL_TYPES));
         return new EntityType().setName(ET_ALL_TYPES.getName()).setProperties(properties);
-      }
-      else if (ET_STRING_FACETS.getName().equals(edmFQName.getName()))
-      {
+      } else if (ET_STRING_FACETS.getName().equals(edmFQName.getName())) {
         final List<Property> properties = new ArrayList<Property>();
 
-        properties.add(new SimpleProperty().setName("StringDefaultValue").setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setDefaultValue("defaultValue")));
+        properties.add(new SimpleProperty().setName("StringDefaultValue").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setDefaultValue("defaultValue")));
 
-        properties.add(new SimpleProperty().setName("StringFixedLength").setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setFixedLength(true)));
+        properties.add(new SimpleProperty().setName("StringFixedLength").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setFixedLength(true)));
 
-        properties.add(new SimpleProperty().setName("StringMaxLength").setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setMaxLength(15)));
+        properties.add(new SimpleProperty().setName("StringMaxLength").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setMaxLength(15)));
 
-        properties.add(new SimpleProperty().setName("StringLength").setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setMaxLength(15).setFixedLength(true)));
+        properties.add(new SimpleProperty().setName("StringLength").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setMaxLength(15).setFixedLength(true)));
 
-        properties.add(new SimpleProperty().setName("StringNullable").setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setNullable(false)));
+        properties.add(new SimpleProperty().setName("StringNullable").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setNullable(false)));
 
-        properties.add(new SimpleProperty().setName("StringUnicode").setType(EdmSimpleTypeKind.String)
-            .setFacets(new Facets().setUnicode(false)));
+        properties.add(new SimpleProperty().setName("StringUnicode").setType(EdmSimpleTypeKind.String).setFacets(new Facets().setUnicode(false)));
 
         return new EntityType().setName(ET_STRING_FACETS.getName()).setProperties(properties);
       }
@@ -195,16 +162,14 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
   }
 
   @Override
-  public ComplexType getComplexType(final FullQualifiedName edmFQName) throws ODataMessageException
-  {
+  public ComplexType getComplexType(final FullQualifiedName edmFQName) throws ODataMessageException {
     if (NAMESPACE_1.equals(edmFQName.getNamespace())) {
       if (CT_ADDRESS.getName().equals(edmFQName.getName())) {
         final List<Property> properties = new ArrayList<Property>();
         properties.add(new SimpleProperty().setName("Street").setType(EdmSimpleTypeKind.String));
         properties.add(new SimpleProperty().setName("City").setType(EdmSimpleTypeKind.String));
         return new ComplexType().setName(CT_ADDRESS.getName()).setAbstract(false).setProperties(properties);
-      }
-      else if (CT_ALL_TYPES.getName().equals(edmFQName.getName())) {
+      } else if (CT_ALL_TYPES.getName().equals(edmFQName.getName())) {
         final List<Property> properties = new ArrayList<Property>();
         properties.add(new SimpleProperty().setName("Boolean").setType(EdmSimpleTypeKind.Boolean));
         properties.add(new SimpleProperty().setName("Binary").setType(EdmSimpleTypeKind.Binary));
@@ -253,8 +218,7 @@ public class TechnicalScenarioEdmProvider extends EdmProvider {
 
   @Override
   public EntitySet getEntitySet(final String entityContainer, final String name) throws ODataMessageException {
-    if (ENTITY_CONTAINER_1.equals(entityContainer))
-    {
+    if (ENTITY_CONTAINER_1.equals(entityContainer)) {
       if (ES_KEY_IS_STRING.equals(name)) {
         return new EntitySet().setName(name).setEntityType(ET_KEY_IS_STRING);
       } else if (ES_KEY_IS_INTEGER.equals(name)) {


[15/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
index 63a771f..14042c6 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderTest.java
@@ -29,9 +29,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
 import org.apache.olingo.odata2.api.edm.provider.AssociationSet;
@@ -44,6 +41,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.ODataJPAContextMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.EdmSchemaMock;
 import org.apache.olingo.odata2.processor.core.jpa.model.JPAEdmModel;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class ODataJPAEdmProviderTest {
 
@@ -67,17 +66,13 @@ public class ODataJPAEdmProviderTest {
       field.setAccessible(true);
       field.set(edmProvider, new JPAEdmModel(null, null));
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -85,8 +80,7 @@ public class ODataJPAEdmProviderTest {
   @Test
   public void testConstructor() {
     try {
-      ODataJPAEdmProvider edmProv = new ODataJPAEdmProvider(
-          ODataJPAContextMock.mockODataJPAContext());
+      ODataJPAEdmProvider edmProv = new ODataJPAEdmProvider(ODataJPAContextMock.mockODataJPAContext());
       edmProv.getClass();
     } catch (Exception e) {
       e.printStackTrace();
@@ -96,8 +90,7 @@ public class ODataJPAEdmProviderTest {
 
   @Test
   public void testGetODataJPAContext() {
-    String pUnitName = edmProvider.getODataJPAContext()
-        .getPersistenceUnitName();
+    String pUnitName = edmProvider.getODataJPAContext().getPersistenceUnitName();
     assertEquals("salesorderprocessing", pUnitName);
   }
 
@@ -106,29 +99,25 @@ public class ODataJPAEdmProviderTest {
     String entityContainerName = null;
     EntityContainerInfo entityContainer = null;
     try {
-      entityContainer = edmProvider
-          .getEntityContainerInfo("salesorderprocessingContainer");
+      entityContainer = edmProvider.getEntityContainerInfo("salesorderprocessingContainer");
       entityContainerName = entityContainer.getName();
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     assertEquals("salesorderprocessingContainer", entityContainerName);
     assertNotNull(entityContainer);
   }
-  
+
   @Test
   public void testDefaultGetEntityContainerInfo() {
     String entityContainerName = null;
     EntityContainerInfo entityContainer = null;
     try {
-      entityContainer = edmProvider
-          .getEntityContainerInfo(null);
+      entityContainer = edmProvider.getEntityContainerInfo(null);
       entityContainerName = entityContainer.getName();
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     assertEquals("salesorderprocessingContainer", entityContainerName);
@@ -137,19 +126,16 @@ public class ODataJPAEdmProviderTest {
 
   @Test
   public void testGetEntityType() {
-    FullQualifiedName entityTypeName = new FullQualifiedName(
-        "salesorderprocessing", "SalesOrderHeader");
+    FullQualifiedName entityTypeName = new FullQualifiedName("salesorderprocessing", "SalesOrderHeader");
     String entityName = null;
     try {
       entityName = edmProvider.getEntityType(entityTypeName).getName();
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertEquals("SalesOrderHeader", entityName);
     try {
-      edmProvider
-          .getEntityType(new FullQualifiedName("salesorder", "abc"));
+      edmProvider.getEntityType(new FullQualifiedName("salesorder", "abc"));
     } catch (ODataException e) {
       assertTrue(true);
     }
@@ -158,14 +144,12 @@ public class ODataJPAEdmProviderTest {
 
   @Test
   public void testGetComplexType() {
-    FullQualifiedName complexTypeName = new FullQualifiedName(
-        "salesorderprocessing", "Address");
+    FullQualifiedName complexTypeName = new FullQualifiedName("salesorderprocessing", "Address");
     String nameStr = null;
     try {
       nameStr = edmProvider.getComplexType(complexTypeName).getName();
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertEquals("Address", nameStr);
   }
@@ -174,11 +158,9 @@ public class ODataJPAEdmProviderTest {
   public void testGetAssociationFullQualifiedName() {
     Association association = null;
     try {
-      association = edmProvider.getAssociation(new FullQualifiedName(
-          "salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
+      association = edmProvider.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNotNull(association);
     assertEquals("SalesOrderHeader_SalesOrderItem", association.getName());
@@ -188,17 +170,13 @@ public class ODataJPAEdmProviderTest {
   public void testGetEntitySet() {
     String entitySetName = null;
     try {
-      entitySetName = edmProvider.getEntitySet(
-          "salesorderprocessingContainer", "SalesOrderHeaders")
-          .getName();
+      entitySetName = edmProvider.getEntitySet("salesorderprocessingContainer", "SalesOrderHeaders").getName();
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertEquals("SalesOrderHeaders", entitySetName);
     try {
-      assertNull(edmProvider.getEntitySet("salesorderprocessing",
-          "SalesOrderHeaders"));
+      assertNull(edmProvider.getEntitySet("salesorderprocessing", "SalesOrderHeaders"));
     } catch (ODataException e) {
       assertTrue(true);
     }
@@ -209,35 +187,20 @@ public class ODataJPAEdmProviderTest {
     AssociationSet associationSet = null;
 
     try {
-      associationSet = edmProvider.getAssociationSet(
-          "salesorderprocessingContainer", new FullQualifiedName(
-              "salesorderprocessing",
-              "SalesOrderHeader_SalesOrderItem"),
-          "SalesOrderHeaders", "SalesOrderHeader");
+      associationSet = edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderHeaders", "SalesOrderHeader");
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNotNull(associationSet);
-    assertEquals("SalesOrderHeader_SalesOrderItemSet",
-        associationSet.getName());
+    assertEquals("SalesOrderHeader_SalesOrderItemSet", associationSet.getName());
     try {
-      associationSet = edmProvider.getAssociationSet(
-          "salesorderprocessingContainer", new FullQualifiedName(
-              "salesorderprocessing",
-              "SalesOrderHeader_SalesOrderItem"),
-          "SalesOrderItems", "SalesOrderItem");
+      associationSet = edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderItems", "SalesOrderItem");
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNotNull(associationSet);
     try {
-      associationSet = edmProvider.getAssociationSet(
-          "salesorderproceContainer", new FullQualifiedName(
-              "salesorderprocessing",
-              "SalesOrderHeader_SalesOrderItem"),
-          "SalesOrderItems", "SalesOrderItem");
+      associationSet = edmProvider.getAssociationSet("salesorderproceContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderItems", "SalesOrderItem");
     } catch (ODataException e) {
       assertTrue(true);
     }
@@ -247,25 +210,18 @@ public class ODataJPAEdmProviderTest {
   public void testGetFunctionImport() {
     String functionImportName = null;
     try {
-      functionImportName = edmProvider.getFunctionImport(
-          "salesorderprocessingContainer",
-          "SalesOrder_FunctionImport1").getName();
+      functionImportName = edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1").getName();
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertEquals("SalesOrder_FunctionImport1", functionImportName);
     try {
-      functionImportName = edmProvider.getFunctionImport(
-          "salesorderprocessingContainer",
-          "SalesOrder_FunctionImport1").getName();
+      functionImportName = edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1").getName();
     } catch (ODataException e) {
       assertTrue(true);
     }
     try {
-      assertNotNull(edmProvider.getFunctionImport(
-          "salesorderprocessingContainer",
-          "SalesOrder_FunctionImport1"));
+      assertNotNull(edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1"));
     } catch (ODataException e) {
       e.printStackTrace();
     }
@@ -276,8 +232,7 @@ public class ODataJPAEdmProviderTest {
     try {
       assertNotNull(edmProvider.getSchemas());
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -295,34 +250,26 @@ public class ODataJPAEdmProviderTest {
       f.setAccessible(true);
       f.set(jpaEdmProv, compTypes);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     try {
-      assertEquals(comp, jpaEdmProv.getComplexType(new FullQualifiedName(
-          "salesorderprocessing", "Address")));
+      assertEquals(comp, jpaEdmProv.getComplexType(new FullQualifiedName("salesorderprocessing", "Address")));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     try {
-      jpaEdmProv.getComplexType(new FullQualifiedName("salesorderessing",
-          "abc"));
+      jpaEdmProv.getComplexType(new FullQualifiedName("salesorderessing", "abc"));
     } catch (ODataJPAModelException e) {
       assertTrue(true);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -331,36 +278,27 @@ public class ODataJPAEdmProviderTest {
     HashMap<String, EntityContainerInfo> entityContainerInfos = new HashMap<String, EntityContainerInfo>();
     EntityContainerInfo entityContainer = new EntityContainerInfo();
     entityContainer.setName("salesorderprocessingContainer");
-    entityContainerInfos.put("salesorderprocessingContainer",
-        entityContainer);
+    entityContainerInfos.put("salesorderprocessingContainer", entityContainer);
     ODataJPAEdmProvider jpaEdmProv = new ODataJPAEdmProvider();
     Class<?> claz = jpaEdmProv.getClass();
     try {
       Field f = claz.getDeclaredField("entityContainerInfos");
       f.setAccessible(true);
       f.set(jpaEdmProv, entityContainerInfos);
-      assertEquals(
-          entityContainer,
-          jpaEdmProv
-              .getEntityContainerInfo("salesorderprocessingContainer"));
+      assertEquals(entityContainer, jpaEdmProv.getEntityContainerInfo("salesorderprocessingContainer"));
       jpaEdmProv.getEntityContainerInfo("abc");
     } catch (ODataJPAModelException e) {
       assertTrue(true);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -369,8 +307,7 @@ public class ODataJPAEdmProviderTest {
     HashMap<String, org.apache.olingo.odata2.api.edm.provider.EntityType> entityTypes = new HashMap<String, org.apache.olingo.odata2.api.edm.provider.EntityType>();
     org.apache.olingo.odata2.api.edm.provider.EntityType entity = new org.apache.olingo.odata2.api.edm.provider.EntityType();
     entity.setName("SalesOrderHeader");
-    entityTypes.put("salesorderprocessing" + "." + "SalesorderHeader",
-        entity);
+    entityTypes.put("salesorderprocessing" + "." + "SalesorderHeader", entity);
     ODataJPAEdmProvider jpaEdmProv = new ODataJPAEdmProvider();
     Class<?> claz = jpaEdmProv.getClass();
     Field f;
@@ -378,33 +315,24 @@ public class ODataJPAEdmProviderTest {
       f = claz.getDeclaredField("entityTypes");
       f.setAccessible(true);
       f.set(jpaEdmProv, entityTypes);
-      assertEquals(entity,
-          jpaEdmProv.getEntityType(new FullQualifiedName(
-              "salesorderprocessing", "SalesorderHeader")));
+      assertEquals(entity, jpaEdmProv.getEntityType(new FullQualifiedName("salesorderprocessing", "SalesorderHeader")));
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     try {
-      jpaEdmProv.getEntityType(new FullQualifiedName("salesoprocessing",
-          "abc"));
+      jpaEdmProv.getEntityType(new FullQualifiedName("salesoprocessing", "abc"));
     } catch (ODataJPAModelException e) {
       assertTrue(true);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -413,8 +341,7 @@ public class ODataJPAEdmProviderTest {
     HashMap<String, Association> associations = new HashMap<String, Association>();
     Association association = new Association();
     association.setName("SalesOrderHeader_SalesOrderItem");
-    associations.put("salesorderprocessing" + "."
-        + "SalesOrderHeader_SalesOrderItem", association);
+    associations.put("salesorderprocessing" + "." + "SalesOrderHeader_SalesOrderItem", association);
     ODataJPAEdmProvider jpaEdmProv = new ODataJPAEdmProvider();
     Class<?> claz = jpaEdmProv.getClass();
     Field f;
@@ -422,34 +349,24 @@ public class ODataJPAEdmProviderTest {
       f = claz.getDeclaredField("associations");
       f.setAccessible(true);
       f.set(jpaEdmProv, associations);
-      assertEquals(association,
-          jpaEdmProv.getAssociation(new FullQualifiedName(
-              "salesorderprocessing",
-              "SalesOrderHeader_SalesOrderItem")));
+      assertEquals(association, jpaEdmProv.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem")));
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     try {
-      jpaEdmProv.getAssociation(new FullQualifiedName(
-          "salesorderprocessing", "abc"));
+      jpaEdmProv.getAssociation(new FullQualifiedName("salesorderprocessing", "abc"));
     } catch (ODataJPAModelException e) {
       assertTrue(true);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
index 5129092..364e830 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLBuilderFactoryTest.java
@@ -36,9 +36,6 @@ import javax.persistence.PersistenceUnitUtil;
 import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.metamodel.Metamodel;
 
-import org.easymock.EasyMock;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -63,6 +60,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.factory.ODataJPAFactoryImpl;
 import org.apache.olingo.odata2.processor.core.jpa.jpql.JPQLSelectContext.JPQLSelectContextBuilder;
 import org.apache.olingo.odata2.processor.core.jpa.jpql.JPQLSelectSingleContext.JPQLSelectSingleContextBuilder;
+import org.easymock.EasyMock;
+import org.junit.Test;
 
 public class JPQLBuilderFactoryTest {
 
@@ -72,58 +71,47 @@ public class JPQLBuilderFactoryTest {
     GetEntitySetUriInfo getEntitySetView = getUriInfo();
 
     // Build JPQL Context
-    JPQLContext selectContext = JPQLContext.createBuilder(
-        JPQLContextType.SELECT, getEntitySetView).build();
-    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl()
-        .getJPQLBuilderFactory().getStatementBuilder(selectContext);
+    JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT, getEntitySetView).build();
+    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
 
     assertTrue(statementBuilder instanceof JPQLSelectStatementBuilder);
 
   }
 
   @Test
-  public void testGetStatementBuilderFactoryforSelectSingle()
-      throws ODataException {
+  public void testGetStatementBuilderFactoryforSelectSingle() throws ODataException {
 
     GetEntityUriInfo getEntityView = getEntityUriInfo();
 
     // Build JPQL Context
-    JPQLContext selectContext = JPQLContext.createBuilder(
-        JPQLContextType.SELECT_SINGLE, getEntityView).build();
-    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl()
-        .getJPQLBuilderFactory().getStatementBuilder(selectContext);
+    JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, getEntityView).build();
+    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
 
     assertTrue(statementBuilder instanceof JPQLSelectSingleStatementBuilder);
 
   }
 
   @Test
-  public void testGetStatementBuilderFactoryforJoinSelect()
-      throws ODataException {
+  public void testGetStatementBuilderFactoryforJoinSelect() throws ODataException {
 
     GetEntitySetUriInfo getEntitySetView = getUriInfo();
 
     // Build JPQL Context
-    JPQLContext selectContext = JPQLContext.createBuilder(
-        JPQLContextType.JOIN, getEntitySetView).build();
-    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl()
-        .getJPQLBuilderFactory().getStatementBuilder(selectContext);
+    JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN, getEntitySetView).build();
+    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
 
     assertTrue(statementBuilder instanceof JPQLJoinStatementBuilder);
 
   }
 
   @Test
-  public void testGetStatementBuilderFactoryforJoinSelectSingle()
-      throws ODataException {
+  public void testGetStatementBuilderFactoryforJoinSelectSingle() throws ODataException {
 
     GetEntityUriInfo getEntityView = getEntityUriInfo();
 
     // Build JPQL Context
-    JPQLContext selectContext = JPQLContext.createBuilder(
-        JPQLContextType.JOIN_SINGLE, getEntityView).build();
-    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl()
-        .getJPQLBuilderFactory().getStatementBuilder(selectContext);
+    JPQLContext selectContext = JPQLContext.createBuilder(JPQLContextType.JOIN_SINGLE, getEntityView).build();
+    JPQLStatementBuilder statementBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getStatementBuilder(selectContext);
 
     assertTrue(statementBuilder instanceof JPQLJoinSelectSingleStatementBuilder);
 
@@ -133,9 +121,7 @@ public class JPQLBuilderFactoryTest {
   public void testGetContextBuilderforDelete() throws ODataException {
 
     // Build JPQL ContextBuilder
-    JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl()
-        .getJPQLBuilderFactory().getContextBuilder(
-            JPQLContextType.DELETE);
+    JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.DELETE);
 
     assertNull(contextBuilder);
 
@@ -145,9 +131,7 @@ public class JPQLBuilderFactoryTest {
   public void testGetContextBuilderforSelect() throws ODataException {
 
     // Build JPQL ContextBuilder
-    JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl()
-        .getJPQLBuilderFactory().getContextBuilder(
-            JPQLContextType.SELECT);
+    JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT);
 
     assertNotNull(contextBuilder);
     assertTrue(contextBuilder instanceof JPQLSelectContextBuilder);
@@ -158,9 +142,7 @@ public class JPQLBuilderFactoryTest {
   public void testGetContextBuilderforSelectSingle() throws ODataException {
 
     // Build JPQL ContextBuilder
-    JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl()
-        .getJPQLBuilderFactory().getContextBuilder(
-            JPQLContextType.SELECT_SINGLE);
+    JPQLContextBuilder contextBuilder = new ODataJPAFactoryImpl().getJPQLBuilderFactory().getContextBuilder(JPQLContextType.SELECT_SINGLE);
 
     assertNotNull(contextBuilder);
     assertTrue(contextBuilder instanceof JPQLSelectSingleContextBuilder);
@@ -168,38 +150,29 @@ public class JPQLBuilderFactoryTest {
   }
 
   private GetEntitySetUriInfo getUriInfo() throws EdmException {
-    GetEntitySetUriInfo getEntitySetView = EasyMock
-        .createMock(GetEntitySetUriInfo.class);
+    GetEntitySetUriInfo getEntitySetView = EasyMock.createMock(GetEntitySetUriInfo.class);
     EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
     EasyMock.expect(edmEntityType.getMapping()).andStubReturn(null);
     EasyMock.expect(edmEntityType.getName()).andStubReturn("SOItem");
     EasyMock.replay(edmEntityType);
-    OrderByExpression orderByExpression = EasyMock
-        .createMock(OrderByExpression.class);
-    EasyMock.expect(getEntitySetView.getTargetEntitySet()).andStubReturn(
-        edmEntitySet);
+    OrderByExpression orderByExpression = EasyMock.createMock(OrderByExpression.class);
+    EasyMock.expect(getEntitySetView.getTargetEntitySet()).andStubReturn(edmEntitySet);
     EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
     EasyMock.expect(startEdmEntityType.getMapping()).andStubReturn(null);
     EasyMock.expect(startEdmEntityType.getName()).andStubReturn("SOHeader");
     EasyMock.expect(startEdmEntitySet.getEntityType()).andStubReturn(startEdmEntityType);
-    EasyMock.expect(getEntitySetView.getStartEntitySet()).andStubReturn(
-        startEdmEntitySet);
+    EasyMock.expect(getEntitySetView.getStartEntitySet()).andStubReturn(startEdmEntitySet);
     EasyMock.replay(startEdmEntityType, startEdmEntitySet);
-    EasyMock.expect(getEntitySetView.getOrderBy()).andStubReturn(
-        orderByExpression);
+    EasyMock.expect(getEntitySetView.getOrderBy()).andStubReturn(orderByExpression);
     EasyMock.expect(getEntitySetView.getSelect()).andStubReturn(null);
     EasyMock.expect(getEntitySetView.getFilter()).andStubReturn(null);
     List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
-    EasyMock.expect(getEntitySetView.getNavigationSegments())
-        .andStubReturn(navigationSegments);
-    KeyPredicate keyPredicate = EasyMock
-        .createMock(KeyPredicate.class);
-    EdmProperty kpProperty = EasyMock
-        .createMock(EdmProperty.class);
-    EdmSimpleType edmType = EasyMock
-        .createMock(EdmSimpleType.class);
+    EasyMock.expect(getEntitySetView.getNavigationSegments()).andStubReturn(navigationSegments);
+    KeyPredicate keyPredicate = EasyMock.createMock(KeyPredicate.class);
+    EdmProperty kpProperty = EasyMock.createMock(EdmProperty.class);
+    EdmSimpleType edmType = EasyMock.createMock(EdmSimpleType.class);
     EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
     EasyMock.expect(edmMapping.getInternalName()).andStubReturn("Field1");
     EasyMock.expect(keyPredicate.getLiteral()).andStubReturn("1");
@@ -218,40 +191,32 @@ public class JPQLBuilderFactoryTest {
     keyPredicates.add(keyPredicate);
     EasyMock.expect(getEntitySetView.getKeyPredicates()).andStubReturn(keyPredicates);
     EasyMock.replay(getEntitySetView);
-    EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(
-        edmEntityType);
+    EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
     EasyMock.replay(edmEntitySet);
     return getEntitySetView;
   }
 
   private GetEntityUriInfo getEntityUriInfo() throws EdmException {
-    GetEntityUriInfo getEntityView = EasyMock
-        .createMock(GetEntityUriInfo.class);
+    GetEntityUriInfo getEntityView = EasyMock.createMock(GetEntityUriInfo.class);
     EdmEntitySet edmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType edmEntityType = EasyMock.createMock(EdmEntityType.class);
-    EasyMock.expect(edmEntityType.getKeyProperties()).andStubReturn(
-        new ArrayList<EdmProperty>());
+    EasyMock.expect(edmEntityType.getKeyProperties()).andStubReturn(new ArrayList<EdmProperty>());
     EasyMock.expect(edmEntityType.getMapping()).andStubReturn(null);
     EasyMock.expect(edmEntityType.getName()).andStubReturn("");
-    EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(
-        edmEntityType);
+    EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
     EasyMock.expect(getEntityView.getSelect()).andStubReturn(null);
-    EasyMock.expect(getEntityView.getTargetEntitySet()).andStubReturn(
-        edmEntitySet);
+    EasyMock.expect(getEntityView.getTargetEntitySet()).andStubReturn(edmEntitySet);
     EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
     EasyMock.expect(startEdmEntityType.getMapping()).andStubReturn(null);
     EasyMock.expect(startEdmEntityType.getName()).andStubReturn("SOHeader");
     EasyMock.expect(startEdmEntitySet.getEntityType()).andStubReturn(startEdmEntityType);
-    EasyMock.expect(getEntityView.getStartEntitySet()).andStubReturn(
-        startEdmEntitySet);
+    EasyMock.expect(getEntityView.getStartEntitySet()).andStubReturn(startEdmEntitySet);
     EasyMock.replay(startEdmEntityType, startEdmEntitySet);
     EasyMock.replay(edmEntityType, edmEntitySet);
-    EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(
-        new ArrayList<KeyPredicate>());
+    EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(new ArrayList<KeyPredicate>());
     List<NavigationSegment> navigationSegments = new ArrayList<NavigationSegment>();
-    EasyMock.expect(getEntityView.getNavigationSegments()).andStubReturn(
-        navigationSegments);
+    EasyMock.expect(getEntityView.getNavigationSegments()).andStubReturn(navigationSegments);
     EasyMock.replay(getEntityView);
     return getEntityView;
   }
@@ -259,8 +224,7 @@ public class JPQLBuilderFactoryTest {
   @Test
   public void testJPAAccessFactory() {
     ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
-    JPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl
-        .getJPAAccessFactory();
+    JPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getJPAAccessFactory();
     ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
     Class<?> clazz = oDataJPAContextImpl.getClass();
     try {
@@ -268,17 +232,13 @@ public class JPQLBuilderFactoryTest {
       field.setAccessible(true);
       field.set(oDataJPAContextImpl, new JPAProcessorImplTest().getLocalEntityManager());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EntityManagerFactory emf = new EntityManagerFactory() {
 
@@ -338,8 +298,7 @@ public class JPQLBuilderFactoryTest {
   public void testOdataJpaAccessFactory() {
 
     ODataJPAFactoryImpl oDataJPAFactoryImpl = new ODataJPAFactoryImpl();
-    ODataJPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl
-        .getODataJPAAccessFactory();
+    ODataJPAAccessFactory jpaAccessFactory = oDataJPAFactoryImpl.getODataJPAAccessFactory();
     ODataJPAContextImpl oDataJPAContextImpl = new ODataJPAContextImpl();
 
     EntityManagerFactory emf = new EntityManagerFactory() {
@@ -402,13 +361,10 @@ public class JPQLBuilderFactoryTest {
     oDataJPAContextImpl.setEntityManagerFactory(emf);
     oDataJPAContextImpl.setPersistenceUnitName("pUnit");
 
-    assertNotNull(jpaAccessFactory.getODataJPAMessageService(new Locale(
-        "en")));
+    assertNotNull(jpaAccessFactory.getODataJPAMessageService(new Locale("en")));
     assertNotNull(jpaAccessFactory.createODataJPAContext());
-    assertNotNull(jpaAccessFactory
-        .createJPAEdmProvider(oDataJPAContextImpl));
-    assertNotNull(jpaAccessFactory
-        .createODataProcessor(oDataJPAContextImpl));
+    assertNotNull(jpaAccessFactory.createJPAEdmProvider(oDataJPAContextImpl));
+    assertNotNull(jpaAccessFactory.createODataProcessor(oDataJPAContextImpl));
 
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
index 6ad377d..6bc8f89 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinContextTest.java
@@ -26,13 +26,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmAssociation;
 import org.apache.olingo.odata2.api.edm.EdmAssociationEnd;
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
@@ -50,6 +43,12 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.jpql.JPQLJoinSelectContext.JPQLJoinContextBuilder;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPQLJoinContextTest {
 
@@ -115,15 +114,13 @@ public class JPQLJoinContextTest {
     EasyMock.expect(entitySetUriInfo.getSelect()).andStubReturn(null);
     EasyMock.expect(entitySetUriInfo.getFilter()).andStubReturn(null);
     EasyMock.expect(entitySetUriInfo.getKeyPredicates()).andStubReturn(keyPredicates);
-    EasyMock.expect(entitySetUriInfo
-        .getTargetEntitySet()).andStubReturn(edmEntitySet);
+    EasyMock.expect(entitySetUriInfo.getTargetEntitySet()).andStubReturn(edmEntitySet);
     EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
     EasyMock.expect(startEdmEntityType.getMapping()).andStubReturn(null);
     EasyMock.expect(startEdmEntityType.getName()).andStubReturn("SOHeader");
     EasyMock.expect(startEdmEntitySet.getEntityType()).andStubReturn(startEdmEntityType);
-    EasyMock.expect(entitySetUriInfo.getStartEntitySet()).andStubReturn(
-        startEdmEntitySet);
+    EasyMock.expect(entitySetUriInfo.getStartEntitySet()).andStubReturn(startEdmEntitySet);
     EasyMock.replay(startEdmEntityType, startEdmEntitySet);
     EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
     EasyMock.expect(edmEntityType.getMapping()).andStubReturn(null);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
index eae1716..77d2975 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContextTest.java
@@ -26,12 +26,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmAssociation;
 import org.apache.olingo.odata2.api.edm.EdmAssociationEnd;
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
@@ -49,6 +43,11 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.jpql.JPQLJoinSelectSingleContext.JPQLJoinSelectSingleContextBuilder;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPQLJoinSelectSingleContextTest {
 
@@ -110,15 +109,13 @@ public class JPQLJoinSelectSingleContextTest {
     EasyMock.expect(entityUriInfo.getSelect()).andStubReturn(null);
     EasyMock.expect(entityUriInfo.getFilter()).andStubReturn(null);
     EasyMock.expect(entityUriInfo.getKeyPredicates()).andStubReturn(createKeyPredicates(toThrowException));
-    EasyMock.expect(entityUriInfo
-        .getTargetEntitySet()).andStubReturn(edmEntitySet);
+    EasyMock.expect(entityUriInfo.getTargetEntitySet()).andStubReturn(edmEntitySet);
     EdmEntitySet startEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType startEdmEntityType = EasyMock.createMock(EdmEntityType.class);
     EasyMock.expect(startEdmEntityType.getMapping()).andStubReturn(null);
     EasyMock.expect(startEdmEntityType.getName()).andStubReturn("SOHeader");
     EasyMock.expect(startEdmEntitySet.getEntityType()).andStubReturn(startEdmEntityType);
-    EasyMock.expect(entityUriInfo.getStartEntitySet()).andStubReturn(
-        startEdmEntitySet);
+    EasyMock.expect(entityUriInfo.getStartEntitySet()).andStubReturn(startEdmEntitySet);
     EasyMock.replay(startEdmEntityType, startEdmEntitySet);
     EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(edmEntityType);
     EasyMock.expect(edmEntityType.getMapping()).andStubReturn(null);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
index 91faa5d..18e7b41 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilderTest.java
@@ -25,12 +25,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmException;
 import org.apache.olingo.odata2.api.edm.EdmMapping;
 import org.apache.olingo.odata2.api.edm.EdmProperty;
@@ -41,6 +35,11 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLJoinSelectSingleContextView;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPQLJoinSelectSingleStatementBuilderTest {
   JPQLJoinSelectSingleContextView context = null;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
index 542800e..95b6e59 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilderTest.java
@@ -26,17 +26,16 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLJoinContextView;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement;
+import org.easymock.EasyMock;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPQLJoinStatementBuilderTest {
   JPQLJoinContextView context = null;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
index 09f533d..89d2e19 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContextImplTest.java
@@ -26,10 +26,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -51,6 +47,9 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.jpql.JPQLSelectContext.JPQLSelectContextBuilder;
+import org.easymock.EasyMock;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPQLSelectContextImplTest {
 
@@ -67,14 +66,11 @@ public class JPQLSelectContextImplTest {
 
   }
 
-  private void buildSelectContext(final boolean orderByIsNull,
-      final boolean selectFieldsIsNull, final boolean filterIsNull,
-      final boolean isTopNull, final boolean isSkipNull) {
+  private void buildSelectContext(final boolean orderByIsNull, final boolean selectFieldsIsNull, final boolean filterIsNull, final boolean isTopNull, final boolean isSkipNull) {
     builder = null;
     selectContext = null;
     keyPredicates = new ArrayList<KeyPredicate>();
-    GetEntitySetUriInfo resultsView = EasyMock
-        .createMock(GetEntitySetUriInfo.class);
+    GetEntitySetUriInfo resultsView = EasyMock.createMock(GetEntitySetUriInfo.class);
 
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType entityType = EasyMock.createMock(EdmEntityType.class);
@@ -106,27 +102,21 @@ public class JPQLSelectContextImplTest {
         fail("Exception not Expected");
       }
 
-      PropertyExpression commonExpression = EasyMock
-          .createMock(PropertyExpression.class);
-      EasyMock.expect(commonExpression.getEdmType()).andStubReturn(
-          edmType);
+      PropertyExpression commonExpression = EasyMock.createMock(PropertyExpression.class);
+      EasyMock.expect(commonExpression.getEdmType()).andStubReturn(edmType);
 
       EdmProperty edmTyped = EasyMock.createMock(EdmProperty.class);
       EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
-      EasyMock.expect(edmMapping.getInternalName()).andStubReturn(
-          fields[i]);
+      EasyMock.expect(edmMapping.getInternalName()).andStubReturn(fields[i]);
       try {
-        EasyMock.expect(edmTyped.getMapping())
-            .andStubReturn(edmMapping);
+        EasyMock.expect(edmTyped.getMapping()).andStubReturn(edmMapping);
       } catch (EdmException e) {
         // TODO Auto-generated catch block
         e.printStackTrace();
       }
-      EasyMock.expect(commonExpression.getEdmProperty()).andStubReturn(
-          edmTyped);
+      EasyMock.expect(commonExpression.getEdmProperty()).andStubReturn(edmTyped);
       OrderExpression order = EasyMock.createMock(OrderExpression.class);
-      EasyMock.expect(order.getExpression()).andStubReturn(
-          commonExpression);
+      EasyMock.expect(order.getExpression()).andStubReturn(commonExpression);
       EasyMock.expect(order.getSortOrder()).andStubReturn(orderType[i]);
       EasyMock.replay(edmMapping, edmTyped, commonExpression);
       EasyMock.replay(order);
@@ -135,8 +125,7 @@ public class JPQLSelectContextImplTest {
 
     } while (++i < 2);
 
-    OrderByExpression orderBy = EasyMock
-        .createMock(OrderByExpression.class);
+    OrderByExpression orderBy = EasyMock.createMock(OrderByExpression.class);
     EasyMock.expect(orderBy.getOrders()).andStubReturn(orderList);
     EasyMock.replay(orderBy);
 
@@ -145,17 +134,13 @@ public class JPQLSelectContextImplTest {
       List<SelectItem> selectItemList = new ArrayList<SelectItem>(2);
       do {
         EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
-        EasyMock.expect(edmMapping.getInternalName()).andStubReturn(
-            fields[i]);
-        EdmProperty edmProperty = EasyMock
-            .createMock(EdmProperty.class);
-        EasyMock.expect(edmProperty.getMapping()).andStubReturn(
-            edmMapping);
+        EasyMock.expect(edmMapping.getInternalName()).andStubReturn(fields[i]);
+        EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
+        EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
         EasyMock.replay(edmMapping, edmProperty);
 
         SelectItem selectItem = EasyMock.createMock(SelectItem.class);
-        EasyMock.expect(selectItem.getProperty()).andStubReturn(
-            edmProperty);
+        EasyMock.expect(selectItem.getProperty()).andStubReturn(edmProperty);
         EasyMock.replay(selectItem);
 
         selectItemList.add(selectItem);
@@ -166,23 +151,19 @@ public class JPQLSelectContextImplTest {
       EasyMock.expect(entityType.getKeyProperties()).andStubReturn(getLocalKeyProperties());
 
       EasyMock.replay(entityType);
-      EasyMock.expect(entitySet.getEntityType())
-          .andStubReturn(entityType);
+      EasyMock.expect(entitySet.getEntityType()).andStubReturn(entityType);
       EasyMock.replay(entitySet);
 
-      EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(
-          entitySet);
+      EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(entitySet);
       if (orderByIsNull) {
         EasyMock.expect(resultsView.getOrderBy()).andStubReturn(null);
       } else {
-        EasyMock.expect(resultsView.getOrderBy())
-            .andStubReturn(orderBy);
+        EasyMock.expect(resultsView.getOrderBy()).andStubReturn(orderBy);
       }
       if (selectFieldsIsNull) {
         EasyMock.expect(resultsView.getSelect()).andStubReturn(null);
       } else {
-        EasyMock.expect(resultsView.getSelect()).andStubReturn(
-            selectItemList);
+        EasyMock.expect(resultsView.getSelect()).andStubReturn(selectItemList);
       }
       // FilterExpression filterExpression =
       // EasyMock.createMock(FilterExpression.class);
@@ -190,9 +171,7 @@ public class JPQLSelectContextImplTest {
       if (filterIsNull) {
         EasyMock.expect(resultsView.getFilter()).andStubReturn(null);
       } else {
-        EasyMock.expect(resultsView.getFilter()).andStubReturn(
-            getFilterExpressionMockedObj(ExpressionKind.PROPERTY,
-                "SalesOrder"));
+        EasyMock.expect(resultsView.getFilter()).andStubReturn(getFilterExpressionMockedObj(ExpressionKind.PROPERTY, "SalesOrder"));
       }
       if (isTopNull) {
         EasyMock.expect(resultsView.getTop()).andStubReturn(null);
@@ -204,16 +183,14 @@ public class JPQLSelectContextImplTest {
       } else {
         EasyMock.expect(resultsView.getSkip()).andStubReturn(0);
       }
-      EasyMock.expect(resultsView.getKeyPredicates()).andStubReturn(
-          keyPredicates);
+      EasyMock.expect(resultsView.getKeyPredicates()).andStubReturn(keyPredicates);
       EasyMock.replay(resultsView);
 
     } catch (EdmException e1) {
       fail("Exception not Expected");
     }
     try {
-      builder = (JPQLSelectContextBuilder) JPQLContext.createBuilder(
-          JPQLContextType.SELECT, resultsView);
+      builder = (JPQLSelectContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT, resultsView);
 
       selectContext = (JPQLSelectContext) builder.build();
     } catch (ODataJPAModelException e) {
@@ -230,8 +207,7 @@ public class JPQLSelectContextImplTest {
       EasyMock.expect(edmProperty.getName()).andStubReturn("Field1");
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(null);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmProperty);
     propertyList.add(edmProperty);
@@ -241,17 +217,14 @@ public class JPQLSelectContextImplTest {
   @Test
   public void testEntityNameThrowingException() {
     // buildSelectContext(false, false, false);
-    GetEntitySetUriInfo resultsView = EasyMock
-        .createMock(GetEntitySetUriInfo.class);
+    GetEntitySetUriInfo resultsView = EasyMock.createMock(GetEntitySetUriInfo.class);
 
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType entityType = EasyMock.createMock(EdmEntityType.class);
 
     try {
-      EasyMock.expect(entityType.getName()).andStubThrow(
-          new EdmException(null));
-      EasyMock.expect(entitySet.getEntityType()).andStubThrow(
-          new EdmException(null));
+      EasyMock.expect(entityType.getName()).andStubThrow(new EdmException(null));
+      EasyMock.expect(entitySet.getEntityType()).andStubThrow(new EdmException(null));
     } catch (EdmException e1) {
       // throw new ODataException();
     }
@@ -259,15 +232,13 @@ public class JPQLSelectContextImplTest {
     EasyMock.replay(entityType);
     EasyMock.replay(entitySet);
 
-    EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(
-        entitySet);
+    EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(entitySet);
     EasyMock.expect(resultsView.getOrderBy()).andStubReturn(null);
     EasyMock.expect(resultsView.getSelect()).andStubReturn(null);
     EasyMock.expect(resultsView.getFilter()).andStubReturn(null);
     EasyMock.replay(resultsView);
     try {
-      JPQLSelectContextBuilder builder1 = (JPQLSelectContextBuilder) JPQLContext
-          .createBuilder(JPQLContextType.SELECT, resultsView);
+      JPQLSelectContextBuilder builder1 = (JPQLSelectContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT, resultsView);
 
       builder1.build();
       fail("Should not come here");
@@ -295,23 +266,11 @@ public class JPQLSelectContextImplTest {
   @Test
   public void testGetOrderByCollection() {
     buildSelectContext(false, false, true, true, true);
-    assertEquals(
-        true,
-        selectContext.getOrderByCollection().containsKey(
-            "E1." + JPQLSelectContextImplTest.fields[0]));
-    assertEquals(
-        "",
-        selectContext.getOrderByCollection().get(
-            "E1." + JPQLSelectContextImplTest.fields[0]));
-
-    assertEquals(
-        true,
-        selectContext.getOrderByCollection().containsKey(
-            "E1." + JPQLSelectContextImplTest.fields[1]));
-    assertEquals(
-        "DESC",
-        selectContext.getOrderByCollection().get(
-            "E1." + JPQLSelectContextImplTest.fields[1]));
+    assertEquals(true, selectContext.getOrderByCollection().containsKey("E1." + JPQLSelectContextImplTest.fields[0]));
+    assertEquals("", selectContext.getOrderByCollection().get("E1." + JPQLSelectContextImplTest.fields[0]));
+
+    assertEquals(true, selectContext.getOrderByCollection().containsKey("E1." + JPQLSelectContextImplTest.fields[1]));
+    assertEquals("DESC", selectContext.getOrderByCollection().get("E1." + JPQLSelectContextImplTest.fields[1]));
   }
 
   @Test
@@ -323,8 +282,7 @@ public class JPQLSelectContextImplTest {
   @Test
   public void testGetJPAEntityName() {
     buildSelectContext(false, false, true, true, true);
-    assertEquals(JPQLSelectContextImplTest.entityTypeName,
-        selectContext.getJPAEntityName());
+    assertEquals(JPQLSelectContextImplTest.entityTypeName, selectContext.getJPAEntityName());
   }
 
   @Test
@@ -336,19 +294,16 @@ public class JPQLSelectContextImplTest {
   @Test
   public void testCreateBuilder() {
     buildSelectContext(false, false, true, true, true);
-    assertEquals(JPQLSelectContextBuilder.class.toString(), builder
-        .getClass().toString());
+    assertEquals(JPQLSelectContextBuilder.class.toString(), builder.getClass().toString());
   }
 
   @Test
   public void testEntitySetAsNull() {
     buildSelectContext(false, false, true, true, true);
     try {
-      JPQLSelectContextBuilder builder = (JPQLSelectContextBuilder) JPQLContext
-          .createBuilder(JPQLContextType.SELECT, null);
+      JPQLSelectContextBuilder builder = (JPQLSelectContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT, null);
 
-      JPQLSelectContext selectContext1 = (JPQLSelectContext) builder
-          .build();
+      JPQLSelectContext selectContext1 = (JPQLSelectContext) builder.build();
       assertNull(selectContext1.getJPAEntityAlias());
       assertNull(selectContext1.getJPAEntityName());
       assertNull(selectContext1.getOrderByCollection());
@@ -365,38 +320,20 @@ public class JPQLSelectContextImplTest {
   @Test
   public void testOrderingWithSkip() {
     buildSelectContext(true, false, true, true, false);
-    assertEquals(
-        true,
-        selectContext.getOrderByCollection().containsKey(
-            "E1." + JPQLSelectContextImplTest.fields[0]));
-    assertEquals(
-        "",
-        selectContext.getOrderByCollection().get(
-            "E1." + JPQLSelectContextImplTest.fields[0]));
-
-    assertEquals(
-        false,
-        selectContext.getOrderByCollection().containsKey(
-            "E1." + JPQLSelectContextImplTest.fields[1]));
+    assertEquals(true, selectContext.getOrderByCollection().containsKey("E1." + JPQLSelectContextImplTest.fields[0]));
+    assertEquals("", selectContext.getOrderByCollection().get("E1." + JPQLSelectContextImplTest.fields[0]));
+
+    assertEquals(false, selectContext.getOrderByCollection().containsKey("E1." + JPQLSelectContextImplTest.fields[1]));
 
   }
 
   @Test
   public void testOrderingWithTop() {
     buildSelectContext(true, false, true, false, true);
-    assertEquals(
-        true,
-        selectContext.getOrderByCollection().containsKey(
-            "E1." + JPQLSelectContextImplTest.fields[0]));
-    assertEquals(
-        "",
-        selectContext.getOrderByCollection().get(
-            "E1." + JPQLSelectContextImplTest.fields[0]));
-
-    assertEquals(
-        false,
-        selectContext.getOrderByCollection().containsKey(
-            "E1." + JPQLSelectContextImplTest.fields[1]));
+    assertEquals(true, selectContext.getOrderByCollection().containsKey("E1." + JPQLSelectContextImplTest.fields[0]));
+    assertEquals("", selectContext.getOrderByCollection().get("E1." + JPQLSelectContextImplTest.fields[0]));
+
+    assertEquals(false, selectContext.getOrderByCollection().containsKey("E1." + JPQLSelectContextImplTest.fields[1]));
 
   }
 
@@ -413,29 +350,18 @@ public class JPQLSelectContextImplTest {
 
   }
 
-  private FilterExpression getFilterExpressionMockedObj(
-      final ExpressionKind leftOperandExpKind, final String propertyName)
-      throws EdmException {
-    FilterExpression filterExpression = EasyMock
-        .createMock(FilterExpression.class);
-    EasyMock.expect(filterExpression.getKind())
-        .andStubReturn(ExpressionKind.FILTER);
-    EasyMock.expect(filterExpression.getExpression())
-        .andStubReturn(
-            getPropertyExpressionMockedObj(leftOperandExpKind,
-                propertyName));
+  private FilterExpression getFilterExpressionMockedObj(final ExpressionKind leftOperandExpKind, final String propertyName) throws EdmException {
+    FilterExpression filterExpression = EasyMock.createMock(FilterExpression.class);
+    EasyMock.expect(filterExpression.getKind()).andStubReturn(ExpressionKind.FILTER);
+    EasyMock.expect(filterExpression.getExpression()).andStubReturn(getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
     EasyMock.replay(filterExpression);
     return filterExpression;
   }
 
-  private PropertyExpression getPropertyExpressionMockedObj(
-      final ExpressionKind expKind, final String propertyName) {
-    PropertyExpression leftOperandPropertyExpresion = EasyMock
-        .createMock(PropertyExpression.class);
-    EasyMock.expect(leftOperandPropertyExpresion.getKind()).andReturn(
-        ExpressionKind.PROPERTY);
-    EasyMock.expect(leftOperandPropertyExpresion.getPropertyName())
-        .andReturn(propertyName);
+  private PropertyExpression getPropertyExpressionMockedObj(final ExpressionKind expKind, final String propertyName) {
+    PropertyExpression leftOperandPropertyExpresion = EasyMock.createMock(PropertyExpression.class);
+    EasyMock.expect(leftOperandPropertyExpresion.getKind()).andReturn(ExpressionKind.PROPERTY);
+    EasyMock.expect(leftOperandPropertyExpresion.getPropertyName()).andReturn(propertyName);
     EdmProperty edmtTyped = EasyMock.createMock(EdmProperty.class);
     EdmMapping mapping = EasyMock.createMock(EdmMapping.class);
     EasyMock.expect(mapping.getInternalName()).andStubReturn("field");
@@ -445,8 +371,7 @@ public class JPQLSelectContextImplTest {
       // TODO Auto-generated catch block
       e.printStackTrace();
     }
-    EasyMock.expect(leftOperandPropertyExpresion.getEdmProperty())
-        .andReturn(edmtTyped);
+    EasyMock.expect(leftOperandPropertyExpresion.getEdmProperty()).andReturn(edmtTyped);
     EasyMock.replay(mapping, edmtTyped, leftOperandPropertyExpresion);
     return leftOperandPropertyExpresion;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
index 7baa021..d74ef5b 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContextImplTest.java
@@ -25,9 +25,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -42,6 +39,8 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.core.jpa.jpql.JPQLSelectSingleContext.JPQLSelectSingleContextBuilder;
+import org.easymock.EasyMock;
+import org.junit.Test;
 
 public class JPQLSelectSingleContextImplTest {
 
@@ -56,8 +55,7 @@ public class JPQLSelectSingleContextImplTest {
     builder = null;
     selectContext = null;
     keyPredicates = new ArrayList<KeyPredicate>();
-    GetEntityUriInfo resultsView = EasyMock
-        .createMock(GetEntityUriInfo.class);
+    GetEntityUriInfo resultsView = EasyMock.createMock(GetEntityUriInfo.class);
 
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType entityType = EasyMock.createMock(EdmEntityType.class);
@@ -82,17 +80,13 @@ public class JPQLSelectSingleContextImplTest {
       List<SelectItem> selectItemList = new ArrayList<SelectItem>(2);
       do {
         EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
-        EasyMock.expect(edmMapping.getInternalName()).andStubReturn(
-            fields[i]);
-        EdmProperty edmProperty = EasyMock
-            .createMock(EdmProperty.class);
-        EasyMock.expect(edmProperty.getMapping()).andStubReturn(
-            edmMapping);
+        EasyMock.expect(edmMapping.getInternalName()).andStubReturn(fields[i]);
+        EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
+        EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
         EasyMock.replay(edmMapping, edmProperty);
 
         SelectItem selectItem = EasyMock.createMock(SelectItem.class);
-        EasyMock.expect(selectItem.getProperty()).andStubReturn(
-            edmProperty);
+        EasyMock.expect(selectItem.getProperty()).andStubReturn(edmProperty);
         EasyMock.replay(selectItem);
 
         selectItemList.add(selectItem);
@@ -102,29 +96,24 @@ public class JPQLSelectSingleContextImplTest {
       EasyMock.expect(entityType.getMapping()).andStubReturn(null);
       EasyMock.expect(entityType.getName()).andStubReturn(entityTypeName);
       EasyMock.replay(entityType);
-      EasyMock.expect(entitySet.getEntityType())
-          .andStubReturn(entityType);
+      EasyMock.expect(entitySet.getEntityType()).andStubReturn(entityType);
       EasyMock.replay(entitySet);
 
-      EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(
-          entitySet);
+      EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(entitySet);
       if (isSelectNull) {
         selectItemList = null;
       }
-      EasyMock.expect(resultsView.getSelect()).andStubReturn(
-          selectItemList);
+      EasyMock.expect(resultsView.getSelect()).andStubReturn(selectItemList);
       ArrayList<KeyPredicate> arrayList = new ArrayList<KeyPredicate>();
       arrayList.add(keyPredicate);
-      EasyMock.expect(resultsView.getKeyPredicates()).andStubReturn(
-          arrayList);
+      EasyMock.expect(resultsView.getKeyPredicates()).andStubReturn(arrayList);
       EasyMock.replay(resultsView);
 
     } catch (EdmException e1) {
       fail("Exception not Expected");
     }
     try {
-      builder = (JPQLSelectSingleContextBuilder) JPQLContext
-          .createBuilder(JPQLContextType.SELECT_SINGLE, resultsView);
+      builder = (JPQLSelectSingleContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, resultsView);
 
       selectContext = (JPQLSelectSingleContext) builder.build();
     } catch (ODataJPAModelException e) {
@@ -137,17 +126,14 @@ public class JPQLSelectSingleContextImplTest {
   @Test
   public void testEntityNameThrowingException() {
     // buildSelectContext(false, false, false);
-    GetEntityUriInfo resultsView = EasyMock
-        .createMock(GetEntityUriInfo.class);
+    GetEntityUriInfo resultsView = EasyMock.createMock(GetEntityUriInfo.class);
 
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     EdmEntityType entityType = EasyMock.createMock(EdmEntityType.class);
 
     try {
-      EasyMock.expect(entityType.getName()).andStubThrow(
-          new EdmException(null));
-      EasyMock.expect(entitySet.getEntityType()).andStubThrow(
-          new EdmException(null));
+      EasyMock.expect(entityType.getName()).andStubThrow(new EdmException(null));
+      EasyMock.expect(entitySet.getEntityType()).andStubThrow(new EdmException(null));
     } catch (EdmException e1) {
       // throw new ODataException();
     }
@@ -155,14 +141,12 @@ public class JPQLSelectSingleContextImplTest {
     EasyMock.replay(entityType);
     EasyMock.replay(entitySet);
 
-    EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(
-        entitySet);
+    EasyMock.expect(resultsView.getTargetEntitySet()).andStubReturn(entitySet);
     EasyMock.expect(resultsView.getSelect()).andStubReturn(null);
     EasyMock.expect(resultsView.getFilter()).andStubReturn(null);
     EasyMock.replay(resultsView);
     try {
-      JPQLSelectSingleContextBuilder builder1 = (JPQLSelectSingleContextBuilder) JPQLContext
-          .createBuilder(JPQLContextType.SELECT_SINGLE, resultsView);
+      JPQLSelectSingleContextBuilder builder1 = (JPQLSelectSingleContextBuilder) JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, resultsView);
       builder1.build();
       fail("Should not come here");
     } catch (ODataJPAModelException e) {
@@ -188,16 +172,14 @@ public class JPQLSelectSingleContextImplTest {
   @Test
   public void getKeyPredicates() {
     buildContextBuilder(false);
-    assertEquals(keyPredicates.size(), selectContext.getKeyPredicates()
-        .size());
+    assertEquals(keyPredicates.size(), selectContext.getKeyPredicates().size());
     assertEquals(keyPredicates, selectContext.getKeyPredicates());
   }
 
   @Test
   public void testGetJPAEntityName() {
     buildContextBuilder(false);
-    assertEquals(JPQLSelectSingleContextImplTest.entityTypeName,
-        selectContext.getJPAEntityName());
+    assertEquals(JPQLSelectSingleContextImplTest.entityTypeName, selectContext.getJPAEntityName());
   }
 
   @Test
@@ -209,8 +191,7 @@ public class JPQLSelectSingleContextImplTest {
   @Test
   public void testCreateBuilder() {
     buildContextBuilder(false);
-    assertEquals(JPQLSelectSingleContextBuilder.class.toString(), builder
-        .getClass().toString());
+    assertEquals(JPQLSelectSingleContextBuilder.class.toString(), builder.getClass().toString());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
index a22dc63..b10f740 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilderTest.java
@@ -24,10 +24,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -42,6 +38,9 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPQLSelectSingleStatementBuilderTest {
 
@@ -66,12 +65,9 @@ public class JPQLSelectSingleStatementBuilderTest {
     List<SelectItem> selectItemList = null;
 
     //Setting up the expected value
-    KeyPredicate keyPredicate = EasyMock
-        .createMock(KeyPredicate.class);
-    EdmProperty kpProperty = EasyMock
-        .createMock(EdmProperty.class);
-    EdmSimpleType edmType = EasyMock
-        .createMock(EdmSimpleType.class);
+    KeyPredicate keyPredicate = EasyMock.createMock(KeyPredicate.class);
+    EdmProperty kpProperty = EasyMock.createMock(EdmProperty.class);
+    EdmSimpleType edmType = EasyMock.createMock(EdmSimpleType.class);
     EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
     EasyMock.expect(edmMapping.getInternalName()).andStubReturn("Field1");
     EasyMock.expect(keyPredicate.getLiteral()).andStubReturn("1");
@@ -96,8 +92,7 @@ public class JPQLSelectSingleStatementBuilderTest {
     EasyMock.replay(edmEntityType);
     ArrayList<KeyPredicate> arrayList = new ArrayList<KeyPredicate>();
     arrayList.add(keyPredicate);
-    EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(
-        arrayList);
+    EasyMock.expect(getEntityView.getKeyPredicates()).andStubReturn(arrayList);
     EasyMock.replay(getEntityView);
 
     JPQLContextBuilder contextBuilder1 = JPQLContext.createBuilder(JPQLContextType.SELECT_SINGLE, getEntityView);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
index e7af4bd..30b7c65 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilderTest.java
@@ -27,10 +27,6 @@ import static org.junit.Assert.fail;
 import java.util.HashMap;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -43,6 +39,9 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPQLSelectStatementBuilderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
index da6d075..cbb946a 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/ODataJPAContextMock.java
@@ -21,9 +21,8 @@ package org.apache.olingo.odata2.processor.core.jpa.mock;
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.metamodel.Metamodel;
 
-import org.easymock.EasyMock;
-
 import org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext;
+import org.easymock.EasyMock;
 
 public abstract class ODataJPAContextMock {
 
@@ -31,8 +30,7 @@ public abstract class ODataJPAContextMock {
   public static final String MAPPING_MODEL = "SalesOrderProcessingMappingModel";
   public static final String PERSISTENCE_UNIT_NAME = "salesorderprocessing";
 
-  public static ODataJPAContext mockODataJPAContext()
-  {
+  public static ODataJPAContext mockODataJPAContext() {
     ODataJPAContext odataJPAContext = EasyMock.createMock(ODataJPAContext.class);
     EasyMock.expect(odataJPAContext.getPersistenceUnitName()).andStubReturn(NAMESPACE);
     EasyMock.expect(odataJPAContext.getEntityManagerFactory()).andReturn(mockEntityManagerFactory());

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
index ad3fe5a..87c52b5 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/EdmSchemaMock.java
@@ -59,8 +59,7 @@ public class EdmSchemaMock {
   private static final String COMPLEX_TYPE_NAME_ONE = "Address";
   private static final String COMPLEX_TYPE_NAME_TWO = "SalesOrderItemKey";
 
-  public static Schema createMockEdmSchema()
-  {
+  public static Schema createMockEdmSchema() {
     Schema schema = new Schema();
     schema.setNamespace(NAMESPACE);
     schema.setComplexTypes(createComplexTypes());
@@ -87,10 +86,8 @@ public class EdmSchemaMock {
     AssociationSet associationSet = new AssociationSet();
     associationSet.setName(ASSOCIATION_SET_NAME);
     associationSet.setAssociation(new FullQualifiedName(NAMESPACE, ASSOCIATION_NAME));
-    associationSet.setEnd1(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_ONE)
-        .setRole(ASSOCIATION_ROLE_NAME_ONE));
-    associationSet.setEnd2(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_TWO)
-        .setRole(ASSOCIATION_ROLE_NAME_TWO));
+    associationSet.setEnd1(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_ONE).setRole(ASSOCIATION_ROLE_NAME_ONE));
+    associationSet.setEnd2(new AssociationSetEnd().setEntitySet(ENTITY_SET_NAME_TWO).setRole(ASSOCIATION_ROLE_NAME_TWO));
     associationSets.add(associationSet);
     return associationSets;
   }
@@ -123,12 +120,8 @@ public class EdmSchemaMock {
     List<Association> associations = new ArrayList<Association>();
     Association association = new Association();
     association.setName(ASSOCIATION_NAME);
-    association.setEnd1(new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE)
-        .setRole(ASSOCIATION_ROLE_NAME_ONE)
-        .setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_ONE)));
-    association.setEnd2(new AssociationEnd().setMultiplicity(EdmMultiplicity.MANY)
-        .setRole(ASSOCIATION_ROLE_NAME_TWO)
-        .setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_TWO)));
+    association.setEnd1(new AssociationEnd().setMultiplicity(EdmMultiplicity.ONE).setRole(ASSOCIATION_ROLE_NAME_ONE).setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_ONE)));
+    association.setEnd2(new AssociationEnd().setMultiplicity(EdmMultiplicity.MANY).setRole(ASSOCIATION_ROLE_NAME_TWO).setType(new FullQualifiedName(NAMESPACE, ENTITY_NAME_TWO)));
     associations.add(association);
     return associations;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
index eb99b4a..f21539d 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPACustomProcessorMock.java
@@ -34,16 +34,12 @@ public class JPACustomProcessorMock {
   public static final String edmName = "JPACustomProcessor";
 
   @FunctionImport(name = "Method1", entitySet = "MockSet", returnType = ReturnType.ENTITY_TYPE, multiplicity = Multiplicity.MANY)
-  public List<JPACustomProcessorMock> method1(
-      @Parameter(name = "Param1", facets = @Facets(nullable = true, maxLength = 2), mode = Mode.IN) final String param1,
-      final int param2,
-      @Parameter(name = "Param3", facets = @Facets(precision = 10, scale = 2), mode = Mode.IN) final double param3) {
+  public List<JPACustomProcessorMock> method1(@Parameter(name = "Param1", facets = @Facets(nullable = true, maxLength = 2), mode = Mode.IN) final String param1, final int param2, @Parameter(name = "Param3", facets = @Facets(precision = 10, scale = 2), mode = Mode.IN) final double param3) {
     return new ArrayList<JPACustomProcessorMock>();
   }
 
   @FunctionImport(name = "Method2", entitySet = "MockSet", returnType = ReturnType.ENTITY_TYPE, multiplicity = Multiplicity.MANY)
-  public List<JPACustomProcessorMock> method2(
-      @Parameter(facets = @Facets(maxLength = 2), name = "Param2") final String param2) {
+  public List<JPACustomProcessorMock> method2(@Parameter(facets = @Facets(maxLength = 2), name = "Param2") final String param2) {
     return new ArrayList<JPACustomProcessorMock>();
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
index 4efbc2b..8dd39ac 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEdmMockData.java
@@ -49,15 +49,12 @@ public interface JPAEdmMockData {
     }
   }
 
-  public interface EntityType
-  {
-    public interface EntityTypeA
-    {
+  public interface EntityType {
+    public interface EntityTypeA {
       public static final String name = "SalesOrderHeader";
       public static final Class<EntityTypeA> entityClazz = EntityTypeA.class;
 
-      public interface Property
-      {
+      public interface Property {
         public static final String PROPERTY_A = SimpleType.SimpleTypeA.NAME;
 
       }
@@ -65,10 +62,8 @@ public interface JPAEdmMockData {
     }
   }
 
-  public interface SimpleType
-  {
-    public interface SimpleTypeA
-    {
+  public interface SimpleType {
+    public interface SimpleTypeA {
       public static final String NAME = "SOID";
       public static final Class<String> clazz = String.class;
       public static final Class<EntityTypeA> declaringClazz = EntityType.EntityTypeA.class;


[17/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
index 3684790..66ad0c8 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilderTest.java
@@ -32,9 +32,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.easymock.EasyMock;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.commons.InlineCount;
 import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
@@ -64,6 +61,8 @@ import org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.model.JPAEdmTestModelView;
+import org.easymock.EasyMock;
+import org.junit.Test;
 
 public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
 
@@ -82,37 +81,26 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
     // Invoking the private static method using reflection
     Class<?> clazz = ODataJPAResponseBuilder.class;
     Object[] actualParameters = { oDataJPAContext, getEntitySetUriInfo, edmEntityList };
-    Class<?>[] formalParameters = { ODataJPAContext.class,
-        GetEntitySetUriInfo.class, List.class };
+    Class<?>[] formalParameters = { ODataJPAContext.class, GetEntitySetUriInfo.class, List.class };
     EntityProviderWriteProperties providerProperties = null;
     try {
-      ODataJPAResponseBuilder responseBuilder = (ODataJPAResponseBuilder) clazz
-          .newInstance();
-      Method method = clazz.getDeclaredMethod(
-          "getEntityProviderProperties", formalParameters);
+      ODataJPAResponseBuilder responseBuilder = (ODataJPAResponseBuilder) clazz.newInstance();
+      Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
       method.setAccessible(true);
-      providerProperties = (EntityProviderWriteProperties) method.invoke(
-          responseBuilder, actualParameters);
-      assertEquals(1, providerProperties.getExpandSelectTree().getLinks()
-          .size());
+      providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
+      assertEquals(1, providerProperties.getExpandSelectTree().getLinks().size());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchMethodException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InvocationTargetException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InstantiationException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -127,45 +115,33 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
     ODataJPAContext oDataJPAContext = getODataJPAContext();
     Class<?> clazz = ODataJPAResponseBuilder.class;
     Object[] actualParameters = { oDataJPAContext, getEntityUriInfo };
-    Class<?>[] formalParameters = { ODataJPAContext.class,
-        GetEntityUriInfo.class };
+    Class<?>[] formalParameters = { ODataJPAContext.class, GetEntityUriInfo.class };
     EntityProviderWriteProperties providerProperties = null;
     try {
-      ODataJPAResponseBuilder responseBuilder = (ODataJPAResponseBuilder) clazz
-          .newInstance();
-      Method method = clazz.getDeclaredMethod(
-          "getEntityProviderProperties", formalParameters);
+      ODataJPAResponseBuilder responseBuilder = (ODataJPAResponseBuilder) clazz.newInstance();
+      Method method = clazz.getDeclaredMethod("getEntityProviderProperties", formalParameters);
       method.setAccessible(true);
-      providerProperties = (EntityProviderWriteProperties) method.invoke(
-          responseBuilder, actualParameters);
-      assertEquals(1, providerProperties.getExpandSelectTree().getLinks()
-          .size());
+      providerProperties = (EntityProviderWriteProperties) method.invoke(responseBuilder, actualParameters);
+      assertEquals(1, providerProperties.getExpandSelectTree().getLinks().size());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchMethodException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InvocationTargetException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InstantiationException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
 
   @SuppressWarnings("unchecked")
   @Test
-  public void testConstructListofNavProperty()
-  {
+  public void testConstructListofNavProperty() {
     List<ArrayList<NavigationPropertySegment>> expand = new ArrayList<ArrayList<NavigationPropertySegment>>();
     ArrayList<NavigationPropertySegment> navPropList1 = new ArrayList<NavigationPropertySegment>();
     navPropList1.add(getNavigationPropertySegment("DemoNavigationProperties11"));
@@ -180,36 +156,26 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
     Class<?>[] formalParameters = { List.class };
     List<EdmNavigationProperty> navigationProperties = null;
     try {
-      ODataJPAResponseBuilder responseBuilder = (ODataJPAResponseBuilder) clazz
-          .newInstance();
-      Method method = clazz.getDeclaredMethod(
-          "constructListofNavProperty", formalParameters);
+      ODataJPAResponseBuilder responseBuilder = (ODataJPAResponseBuilder) clazz.newInstance();
+      Method method = clazz.getDeclaredMethod("constructListofNavProperty", formalParameters);
       method.setAccessible(true);
-      navigationProperties = (List<EdmNavigationProperty>) method.invoke(
-          responseBuilder, actualParameters);
+      navigationProperties = (List<EdmNavigationProperty>) method.invoke(responseBuilder, actualParameters);
       assertEquals("DemoNavigationProperties21", navigationProperties.get(1).getName());
       assertEquals("DemoNavigationProperties11", navigationProperties.get(0).getName());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchMethodException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InvocationTargetException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InstantiationException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -217,11 +183,9 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   @Test
   public void testBuildListOfTGetEntitySetUriInfoStringODataJPAContext() {
     try {
-      assertNotNull(ODataJPAResponseBuilder.build(getJPAEntities(),
-          getResultsView(), "application/xml", getODataJPAContext()));
+      assertNotNull(ODataJPAResponseBuilder.build(getJPAEntities(), getResultsView(), "application/xml", getODataJPAContext()));
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -232,8 +196,7 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
       EntityType entity = new EntityType();
       entity.setName("SalesOrderHeader");
       try {
-        assertNotNull(ODataJPAResponseBuilder.build(getEntity(),
-            getLocalGetURIInfo(), "xml", getODataJPAContext()));
+        assertNotNull(ODataJPAResponseBuilder.build(getEntity(), getLocalGetURIInfo(), "xml", getODataJPAContext()));
       } catch (ODataNotFoundException e) {
         assertTrue(true);
       }
@@ -241,8 +204,7 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
       assertTrue(true);// Nothing to do, Expected.
     }
     try {// Bad content type
-      assertNotNull(ODataJPAResponseBuilder.build(getJPAEntities(),
-          getResultsView(), "xml", getODataJPAContext()));
+      assertNotNull(ODataJPAResponseBuilder.build(getJPAEntities(), getResultsView(), "xml", getODataJPAContext()));
     } catch (ODataJPARuntimeException e) {
       assertTrue(true);// Nothing to do, Expected.
     }
@@ -250,24 +212,18 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   }
 
   @Test
-  public void testBuildObjectGetEntityUriInfoStringODataJPAContext()
-      throws ODataNotFoundException {
+  public void testBuildObjectGetEntityUriInfoStringODataJPAContext() throws ODataNotFoundException {
     try {
-      assertNotNull(ODataJPAResponseBuilder.build(new SalesOrderHeader(2,
-          10), getLocalGetURIInfo(), "application/xml",
-          getODataJPAContext()));
+      assertNotNull(ODataJPAResponseBuilder.build(new SalesOrderHeader(2, 10), getLocalGetURIInfo(), "application/xml", getODataJPAContext()));
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
   @Test
   public void testBuildNullSelects() {// Bad content type
     try {
-      ODataJPAResponseBuilder.build(getJPAEntities(),
-          getResultsViewWithNullSelects(), "xml",
-          getODataJPAContext());
+      ODataJPAResponseBuilder.build(getJPAEntities(), getResultsViewWithNullSelects(), "xml", getODataJPAContext());
     } catch (ODataJPARuntimeException e) {
       assertTrue(true);// Nothing to do, Expected.
     } catch (Exception e) {
@@ -279,20 +235,16 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   public void testBuildGetCount() {
     ODataResponse objODataResponse = null;
     try {
-      objODataResponse = ODataJPAResponseBuilder.build(1,
-          getODataJPAContext());
+      objODataResponse = ODataJPAResponseBuilder.build(1, getODataJPAContext());
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNotNull(objODataResponse);
   }
 
   private ODataJPAContext getODataJPAContext() {
-    ODataJPAContext objODataJPAContext = EasyMock
-        .createMock(ODataJPAContext.class);
-    EasyMock.expect(objODataJPAContext.getODataContext()).andStubReturn(
-        getLocalODataContext());
+    ODataJPAContext objODataJPAContext = EasyMock.createMock(ODataJPAContext.class);
+    EasyMock.expect(objODataJPAContext.getODataContext()).andStubReturn(getLocalODataContext());
     EasyMock.replay(objODataJPAContext);
     return objODataJPAContext;
   }
@@ -300,11 +252,9 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   private ODataContext getLocalODataContext() {
     ODataContext objODataContext = EasyMock.createMock(ODataContext.class);
     try {
-      EasyMock.expect(objODataContext.getPathInfo()).andStubReturn(
-          getLocalPathInfo());
+      EasyMock.expect(objODataContext.getPathInfo()).andStubReturn(getLocalPathInfo());
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(objODataContext);
     return objODataContext;
@@ -320,26 +270,19 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   private URI getLocalURI() {
     URI uri = null;
     try {
-      uri = new URI(
-          "http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/");
+      uri = new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/");
     } catch (URISyntaxException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return uri;
   }
 
   private GetEntitySetUriInfo getResultsView() {
-    GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock
-        .createMock(GetEntitySetUriInfo.class);
-    EasyMock.expect(objGetEntitySetUriInfo.getInlineCount()).andStubReturn(
-        getLocalInlineCount());
-    EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet())
-        .andStubReturn(getLocalTargetEntitySet());
-    EasyMock.expect(objGetEntitySetUriInfo.getSelect()).andStubReturn(
-        getSelectItemList());
-    EasyMock.expect(objGetEntitySetUriInfo.getExpand()).andStubReturn(
-        getExpandList());
+    GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock.createMock(GetEntitySetUriInfo.class);
+    EasyMock.expect(objGetEntitySetUriInfo.getInlineCount()).andStubReturn(getLocalInlineCount());
+    EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet()).andStubReturn(getLocalTargetEntitySet());
+    EasyMock.expect(objGetEntitySetUriInfo.getSelect()).andStubReturn(getSelectItemList());
+    EasyMock.expect(objGetEntitySetUriInfo.getExpand()).andStubReturn(getExpandList());
     EasyMock.expect(objGetEntitySetUriInfo.getSkip()).andStubReturn(new Integer(1));
     EasyMock.replay(objGetEntitySetUriInfo);
     return objGetEntitySetUriInfo;
@@ -351,12 +294,9 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   }
 
   private GetEntitySetUriInfo getResultsViewWithNullSelects() {
-    GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock
-        .createMock(GetEntitySetUriInfo.class);
-    EasyMock.expect(objGetEntitySetUriInfo.getInlineCount()).andStubReturn(
-        getLocalInlineCount());
-    EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet())
-        .andStubReturn(getLocalTargetEntitySet());
+    GetEntitySetUriInfo objGetEntitySetUriInfo = EasyMock.createMock(GetEntitySetUriInfo.class);
+    EasyMock.expect(objGetEntitySetUriInfo.getInlineCount()).andStubReturn(getLocalInlineCount());
+    EasyMock.expect(objGetEntitySetUriInfo.getTargetEntitySet()).andStubReturn(getLocalTargetEntitySet());
     EasyMock.expect(objGetEntitySetUriInfo.getSelect()).andStubReturn(null);
     EasyMock.expect(objGetEntitySetUriInfo.getExpand()).andStubReturn(null);
     EasyMock.expect(objGetEntitySetUriInfo.getSkip()).andStubReturn(new Integer(1));
@@ -366,14 +306,10 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   }
 
   private GetEntityUriInfo getLocalGetURIInfo() {
-    GetEntityUriInfo objGetEntityUriInfo = EasyMock
-        .createMock(GetEntityUriInfo.class);
-    EasyMock.expect(objGetEntityUriInfo.getSelect()).andStubReturn(
-        getSelectItemList());
-    EasyMock.expect(objGetEntityUriInfo.getTargetEntitySet())
-        .andStubReturn(getLocalTargetEntitySet());
-    EasyMock.expect(objGetEntityUriInfo.getExpand()).andStubReturn(
-        getExpandList());
+    GetEntityUriInfo objGetEntityUriInfo = EasyMock.createMock(GetEntityUriInfo.class);
+    EasyMock.expect(objGetEntityUriInfo.getSelect()).andStubReturn(getSelectItemList());
+    EasyMock.expect(objGetEntityUriInfo.getTargetEntitySet()).andStubReturn(getLocalTargetEntitySet());
+    EasyMock.expect(objGetEntityUriInfo.getExpand()).andStubReturn(getExpandList());
     EasyMock.replay(objGetEntityUriInfo);
     return objGetEntityUriInfo;
   }
@@ -386,11 +322,9 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
 
   private SelectItem getSelectItem() {
     SelectItem selectItem = EasyMock.createMock(SelectItem.class);
-    EasyMock.expect(selectItem.getProperty()).andStubReturn(
-        getEdmPropertyForSelect());
+    EasyMock.expect(selectItem.getProperty()).andStubReturn(getEdmPropertyForSelect());
     List<NavigationPropertySegment> navigationSegmentList = new ArrayList<NavigationPropertySegment>();
-    EasyMock.expect(selectItem.getNavigationPropertySegments())
-        .andStubReturn(navigationSegmentList);
+    EasyMock.expect(selectItem.getNavigationPropertySegments()).andStubReturn(navigationSegmentList);
     EasyMock.replay(selectItem);
     return selectItem;
   }
@@ -400,15 +334,10 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
     EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
     Facets facets = new Facets().setNullable(false);
     try {
-      EasyMock.expect(
-          edmType.valueToString(new Integer(2), EdmLiteralKind.URI,
-              facets)).andStubReturn("2");
-      EasyMock.expect(
-          edmType.valueToString(new Integer(2),
-              EdmLiteralKind.DEFAULT, facets)).andStubReturn("2");
+      EasyMock.expect(edmType.valueToString(new Integer(2), EdmLiteralKind.URI, facets)).andStubReturn("2");
+      EasyMock.expect(edmType.valueToString(new Integer(2), EdmLiteralKind.DEFAULT, facets)).andStubReturn("2");
     } catch (EdmSimpleTypeException e1) {
-      fail("There is an exception in mocking EdmType object "
-          + e1.getMessage());
+      fail("There is an exception in mocking EdmType object " + e1.getMessage());
     }
     EasyMock.replay(edmType);
     EdmProperty edmProperty = EasyMock.createMock(EdmProperty.class);
@@ -421,14 +350,12 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
       EasyMock.expect(edmProperty.getType()).andStubReturn(edmType);
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
       EasyMock.expect(edmProperty.getFacets()).andStubReturn(facets);
-      EasyMock.expect(edmProperty.getCustomizableFeedMappings())
-          .andStubReturn(null);
+      EasyMock.expect(edmProperty.getCustomizableFeedMappings()).andStubReturn(null);
       EasyMock.expect(edmProperty.getMimeType()).andStubReturn(null);
       EasyMock.replay(edmProperty);
 
     } catch (EdmException e) {
-      fail("There is an exception in mocking some object "
-          + e.getMessage());
+      fail("There is an exception in mocking some object " + e.getMessage());
     }
 
     return edmProperty;
@@ -438,15 +365,11 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   private EdmEntitySet getLocalTargetEntitySet() {
     EdmEntitySet objEdmEntitySet = EasyMock.createMock(EdmEntitySet.class);
     try {
-      EasyMock.expect(objEdmEntitySet.getEntityType()).andStubReturn(
-          getLocalEdmEntityType());
-      EasyMock.expect(objEdmEntitySet.getName()).andStubReturn(
-          "SalesOderHeaders");
-      EasyMock.expect(objEdmEntitySet.getEntityContainer())
-          .andStubReturn(getLocalEdmEntityContainer());
+      EasyMock.expect(objEdmEntitySet.getEntityType()).andStubReturn(getLocalEdmEntityType());
+      EasyMock.expect(objEdmEntitySet.getName()).andStubReturn("SalesOderHeaders");
+      EasyMock.expect(objEdmEntitySet.getEntityContainer()).andStubReturn(getLocalEdmEntityContainer());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     EasyMock.replay(objEdmEntitySet);
@@ -454,16 +377,12 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   }
 
   private EdmEntityContainer getLocalEdmEntityContainer() {
-    EdmEntityContainer edmEntityContainer = EasyMock
-        .createMock(EdmEntityContainer.class);
-    EasyMock.expect(edmEntityContainer.isDefaultEntityContainer())
-        .andStubReturn(true);
+    EdmEntityContainer edmEntityContainer = EasyMock.createMock(EdmEntityContainer.class);
+    EasyMock.expect(edmEntityContainer.isDefaultEntityContainer()).andStubReturn(true);
     try {
-      EasyMock.expect(edmEntityContainer.getName()).andStubReturn(
-          "salesorderprocessingContainer");
+      EasyMock.expect(edmEntityContainer.getName()).andStubReturn("salesorderprocessingContainer");
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     EasyMock.replay(edmEntityContainer);
@@ -471,30 +390,21 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   }
 
   private EdmEntityType getLocalEdmEntityType() {
-    EdmEntityType objEdmEntityType = EasyMock
-        .createMock(EdmEntityType.class);
+    EdmEntityType objEdmEntityType = EasyMock.createMock(EdmEntityType.class);
     try {
-      EasyMock.expect(objEdmEntityType.getName()).andStubReturn(
-          "SalesOderHeaders");
-      EasyMock.expect(objEdmEntityType.getNamespace()).andStubReturn(
-          "SalesOderHeaders");
+      EasyMock.expect(objEdmEntityType.getName()).andStubReturn("SalesOderHeaders");
+      EasyMock.expect(objEdmEntityType.getNamespace()).andStubReturn("SalesOderHeaders");
       EasyMock.expect(objEdmEntityType.hasStream()).andStubReturn(false);
       EasyMock.expect(objEdmEntityType.hasStream()).andStubReturn(false);
       ArrayList<String> propertyNames = new ArrayList<String>();
       propertyNames.add("ID");
-      EasyMock.expect(objEdmEntityType.getProperty("ID")).andStubReturn(
-          getEdmPropertyForSelect());
-      EasyMock.expect(objEdmEntityType.getPropertyNames()).andStubReturn(
-          propertyNames);
-      EasyMock.expect(objEdmEntityType.getNavigationPropertyNames())
-          .andStubReturn(new ArrayList<String>());
-      EasyMock.expect(objEdmEntityType.getKeyPropertyNames())
-          .andStubReturn(propertyNames);
-      EasyMock.expect(objEdmEntityType.getKeyProperties()).andStubReturn(
-          getKeyProperties());
+      EasyMock.expect(objEdmEntityType.getProperty("ID")).andStubReturn(getEdmPropertyForSelect());
+      EasyMock.expect(objEdmEntityType.getPropertyNames()).andStubReturn(propertyNames);
+      EasyMock.expect(objEdmEntityType.getNavigationPropertyNames()).andStubReturn(new ArrayList<String>());
+      EasyMock.expect(objEdmEntityType.getKeyPropertyNames()).andStubReturn(propertyNames);
+      EasyMock.expect(objEdmEntityType.getKeyProperties()).andStubReturn(getKeyProperties());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(objEdmEntityType);
     return objEdmEntityType;
@@ -515,8 +425,7 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
       EasyMock.replay(edmProperty);
     } catch (EdmException e) {
-      fail("There is an exception is mocking some object "
-          + e.getMessage());
+      fail("There is an exception is mocking some object " + e.getMessage());
     }
 
     edmProperties.add(edmProperty);
@@ -573,31 +482,23 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
     List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
     ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
     // Mocking the navigation property
-    EdmNavigationProperty navigationProperty = EasyMock
-        .createMock(EdmNavigationProperty.class);
+    EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
     try {
-      EasyMock.expect(navigationProperty.getName()).andStubReturn(
-          "SalesOrderItemDetails");
+      EasyMock.expect(navigationProperty.getName()).andStubReturn("SalesOrderItemDetails");
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(navigationProperty);
     // Mocking the navigation property segments and adding to expand list
-    NavigationPropertySegment navigationPropertySegment = EasyMock
-        .createMock(NavigationPropertySegment.class);
-    EasyMock.expect(navigationPropertySegment.getNavigationProperty())
-        .andStubReturn(navigationProperty);
-    EasyMock.expect(navigationPropertySegment.getTargetEntitySet())
-        .andStubReturn(getTargetEntitySetForExpand());
+    NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
+    EasyMock.expect(navigationPropertySegment.getNavigationProperty()).andStubReturn(navigationProperty);
+    EasyMock.expect(navigationPropertySegment.getTargetEntitySet()).andStubReturn(getTargetEntitySetForExpand());
     EasyMock.replay(navigationPropertySegment);
     navigationPropertyList.add(navigationPropertySegment);
     expandList.add(navigationPropertyList);
     // Mocking EntityUriInfo
-    GetEntityUriInfo entityUriInfo = EasyMock
-        .createMock(GetEntityUriInfo.class);
-    EasyMock.expect(entityUriInfo.getSelect())
-        .andStubReturn(selectItemList);
+    GetEntityUriInfo entityUriInfo = EasyMock.createMock(GetEntityUriInfo.class);
+    EasyMock.expect(entityUriInfo.getSelect()).andStubReturn(selectItemList);
     EasyMock.expect(entityUriInfo.getExpand()).andStubReturn(expandList);
     EasyMock.replay(entityUriInfo);
     return entityUriInfo;
@@ -609,31 +510,23 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
     List<ArrayList<NavigationPropertySegment>> expandList = new ArrayList<ArrayList<NavigationPropertySegment>>();
     ArrayList<NavigationPropertySegment> navigationPropertyList = new ArrayList<NavigationPropertySegment>();
     // Mocking the navigation property
-    EdmNavigationProperty navigationProperty = EasyMock
-        .createMock(EdmNavigationProperty.class);
+    EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
     try {
-      EasyMock.expect(navigationProperty.getName()).andStubReturn(
-          "SalesOrderItemDetails");
+      EasyMock.expect(navigationProperty.getName()).andStubReturn("SalesOrderItemDetails");
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(navigationProperty);
     // Mocking the navigation property segments and adding to expand list
-    NavigationPropertySegment navigationPropertySegment = EasyMock
-        .createMock(NavigationPropertySegment.class);
-    EasyMock.expect(navigationPropertySegment.getNavigationProperty())
-        .andStubReturn(navigationProperty);
-    EasyMock.expect(navigationPropertySegment.getTargetEntitySet())
-        .andStubReturn(getTargetEntitySetForExpand());
+    NavigationPropertySegment navigationPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);
+    EasyMock.expect(navigationPropertySegment.getNavigationProperty()).andStubReturn(navigationProperty);
+    EasyMock.expect(navigationPropertySegment.getTargetEntitySet()).andStubReturn(getTargetEntitySetForExpand());
     EasyMock.replay(navigationPropertySegment);
     navigationPropertyList.add(navigationPropertySegment);
     expandList.add(navigationPropertyList);
     // Mocking EntityUriInfo
-    GetEntitySetUriInfo entitySetUriInfo = EasyMock
-        .createMock(GetEntitySetUriInfo.class);
-    EasyMock.expect(entitySetUriInfo.getSelect())
-        .andStubReturn(selectItemList);
+    GetEntitySetUriInfo entitySetUriInfo = EasyMock.createMock(GetEntitySetUriInfo.class);
+    EasyMock.expect(entitySetUriInfo.getSelect()).andStubReturn(selectItemList);
     EasyMock.expect(entitySetUriInfo.getExpand()).andStubReturn(expandList);
     EasyMock.expect(entitySetUriInfo.getInlineCount()).andStubReturn(InlineCount.ALLPAGES);
     EasyMock.expect(entitySetUriInfo.getSkip()).andStubReturn(new Integer(1));
@@ -645,25 +538,21 @@ public class ODataJPAResponseBuilderTest extends JPAEdmTestModelView {
   private EdmEntitySet getTargetEntitySetForExpand() {
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     try {
-      EasyMock.expect(entitySet.getName()).andStubReturn(
-          "SalesOrderHeaders");
+      EasyMock.expect(entitySet.getName()).andStubReturn("SalesOrderHeaders");
       EasyMock.expect(entitySet.getEntityType()).andStubReturn(null);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entitySet);
     return entitySet;
   }
 
-  private NavigationPropertySegment getNavigationPropertySegment(final String navPropertyName)
-  {
+  private NavigationPropertySegment getNavigationPropertySegment(final String navPropertyName) {
     EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
     try {
       EasyMock.expect(navigationProperty.getName()).andStubReturn(navPropertyName);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(navigationProperty);
     NavigationPropertySegment navPropertySegment = EasyMock.createMock(NavigationPropertySegment.class);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
index 232d75e..db4da31 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBackTest.java
@@ -30,8 +30,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.ODataCallback;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -43,6 +41,7 @@ import org.apache.olingo.odata2.api.ep.callback.WriteFeedCallbackResult;
 import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
 import org.apache.olingo.odata2.api.uri.NavigationPropertySegment;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.junit.Test;
 
 public class JPAExpandCallBackTest {
 
@@ -57,17 +56,13 @@ public class JPAExpandCallBackTest {
       WriteEntryCallbackResult result = callBack.retrieveEntryResult(writeFeedContext);
       assertEquals(1, result.getEntryData().size());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -82,17 +77,13 @@ public class JPAExpandCallBackTest {
       WriteFeedCallbackResult result = callBack.retrieveFeedResult(writeFeedContext);
       assertEquals(2, result.getFeedData().size());
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -105,19 +96,16 @@ public class JPAExpandCallBackTest {
       List<ArrayList<NavigationPropertySegment>> expandList = TestUtil.getExpandList();
       callBacks = JPAExpandCallBack.getCallbacks(baseUri, expandSelectTreeNode, expandList);
     } catch (URISyntaxException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertEquals(1, callBacks.size());
 
   }
 
   @Test
-  public void testGetNextNavigationProperty()
-  {
+  public void testGetNextNavigationProperty() {
     JPAExpandCallBack callBack = getJPAExpandCallBackObject();
     List<ArrayList<NavigationPropertySegment>> expandList = TestUtil.getExpandList();
     ArrayList<NavigationPropertySegment> expands = expandList.get(0);
@@ -135,31 +123,23 @@ public class JPAExpandCallBackTest {
       assertEquals("MaterialDetails", result.getName());
 
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchMethodException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (InvocationTargetException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
-  private JPAExpandCallBack getJPAExpandCallBackObject()
-  {
+  private JPAExpandCallBack getJPAExpandCallBackObject() {
     Map<String, ODataCallback> callBacks = null;
     try {
       URI baseUri = new URI("http://localhost:8080/org.apache.olingo.odata2.processor.ref.web/SalesOrderProcessing.svc/");
@@ -167,11 +147,9 @@ public class JPAExpandCallBackTest {
       List<ArrayList<NavigationPropertySegment>> expandList = TestUtil.getExpandList();
       callBacks = JPAExpandCallBack.getCallbacks(baseUri, expandSelectTreeNode, expandList);
     } catch (URISyntaxException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return (JPAExpandCallBack) callBacks.get("SalesOrderLineItemDetails");
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
index fd70433..538a001 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContextTest.java
@@ -26,9 +26,6 @@ import java.util.Map;
 
 import junit.framework.Assert;
 
-import org.easymock.EasyMock;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmException;
 import org.apache.olingo.odata2.api.edm.EdmFunctionImport;
 import org.apache.olingo.odata2.api.edm.EdmLiteral;
@@ -42,6 +39,8 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.model.JPAEdmMappingImpl;
+import org.easymock.EasyMock;
+import org.junit.Test;
 
 public class JPAFunctionContextTest {
 
@@ -51,17 +50,13 @@ public class JPAFunctionContextTest {
     JPAFunctionContext functionContext = null;
     try {
       if (VARIANT == 0) {
-        functionContext = (JPAFunctionContext) JPAMethodContext
-            .createBuilder(JPQLContextType.FUNCTION, getView())
-            .build();
+        functionContext = (JPAFunctionContext) JPAMethodContext.createBuilder(JPQLContextType.FUNCTION, getView()).build();
       }
 
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     return functionContext;
@@ -77,12 +72,9 @@ public class JPAFunctionContextTest {
   }
 
   private GetFunctionImportUriInfo getView() {
-    GetFunctionImportUriInfo functiontView = EasyMock
-        .createMock(GetFunctionImportUriInfo.class);
-    EasyMock.expect(functiontView.getFunctionImport()).andStubReturn(
-        getEdmFunctionImport());
-    EasyMock.expect(functiontView.getFunctionImportParameters())
-        .andStubReturn(getFunctionImportParameters());
+    GetFunctionImportUriInfo functiontView = EasyMock.createMock(GetFunctionImportUriInfo.class);
+    EasyMock.expect(functiontView.getFunctionImport()).andStubReturn(getEdmFunctionImport());
+    EasyMock.expect(functiontView.getFunctionImportParameters()).andStubReturn(getFunctionImportParameters());
 
     EasyMock.replay(functiontView);
     return functiontView;
@@ -93,18 +85,13 @@ public class JPAFunctionContextTest {
   }
 
   private EdmFunctionImport getEdmFunctionImport() {
-    EdmFunctionImport edmFunctionImport = EasyMock
-        .createMock(EdmFunctionImport.class);
+    EdmFunctionImport edmFunctionImport = EasyMock.createMock(EdmFunctionImport.class);
     try {
-      EasyMock.expect(edmFunctionImport.getMapping()).andStubReturn(
-          getMapping());
-      EasyMock.expect(edmFunctionImport.getParameterNames())
-          .andStubReturn(getParameterNames());
-      EasyMock.expect(edmFunctionImport.getParameter("Gentleman"))
-          .andStubReturn(getParameter("Gentleman"));
+      EasyMock.expect(edmFunctionImport.getMapping()).andStubReturn(getMapping());
+      EasyMock.expect(edmFunctionImport.getParameterNames()).andStubReturn(getParameterNames());
+      EasyMock.expect(edmFunctionImport.getParameter("Gentleman")).andStubReturn(getParameter("Gentleman"));
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     EasyMock.replay(edmFunctionImport);
@@ -114,11 +101,9 @@ public class JPAFunctionContextTest {
   private EdmParameter getParameter(final String string) {
     EdmParameter edmParameter = EasyMock.createMock(EdmParameter.class);
     try {
-      EasyMock.expect(edmParameter.getMapping()).andStubReturn(
-          getEdmMapping());
+      EasyMock.expect(edmParameter.getMapping()).andStubReturn(getEdmMapping());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmParameter);
     return edmParameter;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
index 169a13f..0f345fd 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImplTest.java
@@ -33,10 +33,6 @@ import javax.persistence.metamodel.Metamodel;
 
 import junit.framework.Assert;
 
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.commons.InlineCount;
 import org.apache.olingo.odata2.api.edm.EdmConcurrencyMode;
 import org.apache.olingo.odata2.api.edm.EdmEntityContainer;
@@ -64,6 +60,9 @@ import org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAProcessorImplTest {
 
@@ -87,11 +86,9 @@ public class JPAProcessorImplTest {
     try {
       Assert.assertEquals(11, objJPAProcessorImpl.process(getEntitySetCountUriInfo()));
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -100,11 +97,9 @@ public class JPAProcessorImplTest {
     try {
       Assert.assertEquals(11, objJPAProcessorImpl.process(getEntityCountUriInfo()));
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -113,11 +108,9 @@ public class JPAProcessorImplTest {
     try {
       Assert.assertNotNull(objJPAProcessorImpl.process(getEntitySetUriInfo()));
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -127,11 +120,9 @@ public class JPAProcessorImplTest {
       Assert.assertNotNull(objJPAProcessorImpl.process(getDeletetUriInfo(), "application/xml"));
       Assert.assertEquals(new Address(), objJPAProcessorImpl.process(getDeletetUriInfo(), "application/xml"));
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -141,11 +132,9 @@ public class JPAProcessorImplTest {
       Assert.assertNotNull(objJPAProcessorImpl.process(getDeletetUriInfo(), "application/xml"));
       Assert.assertNotSame(new Object(), objJPAProcessorImpl.process(getDeletetUriInfo(), "application/xml"));
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -225,8 +214,7 @@ public class JPAProcessorImplTest {
       EasyMock.expect(edmEntitySet.getEntityType()).andStubReturn(getLocalEdmEntityType());
       EasyMock.replay(edmEntitySet);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return edmEntitySet;
   }
@@ -250,8 +238,7 @@ public class JPAProcessorImplTest {
       EasyMock.expect(edmEntityType.getMapping()).andStubReturn(getEdmMappingMockedObj(SALES_ORDER));// ID vs Salesorder ID
       EasyMock.replay(edmEntityType);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return edmEntityType;
   }
@@ -354,8 +341,7 @@ public class JPAProcessorImplTest {
     @Override
     public boolean equals(final Object obj) {
       boolean isEqual = false;
-      if (obj instanceof Address)
-      {
+      if (obj instanceof Address) {
         isEqual = getSoId().equalsIgnoreCase(((Address) obj).getSoId());//
       }
       return isEqual;
@@ -374,8 +360,7 @@ public class JPAProcessorImplTest {
     try {
       EasyMock.expect(edmEntityContainer.getName()).andStubReturn(SALESORDERPROCESSING_CONTAINER);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     EasyMock.replay(edmEntityContainer);
@@ -385,8 +370,7 @@ public class JPAProcessorImplTest {
   private EdmTyped getEdmTypedMockedObj(final String propertyName) {
     EdmProperty mockedEdmProperty = EasyMock.createMock(EdmProperty.class);
     try {
-      EasyMock.expect(mockedEdmProperty.getMapping())
-          .andStubReturn(getEdmMappingMockedObj(propertyName));
+      EasyMock.expect(mockedEdmProperty.getMapping()).andStubReturn(getEdmMappingMockedObj(propertyName));
       EdmType edmType = EasyMock.createMock(EdmType.class);
       EasyMock.expect(edmType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
       EasyMock.replay(edmType);
@@ -396,8 +380,7 @@ public class JPAProcessorImplTest {
 
       EasyMock.replay(mockedEdmProperty);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return mockedEdmProperty;
   }
@@ -413,11 +396,9 @@ public class JPAProcessorImplTest {
   private EdmMapping getEdmMappingMockedObj(final String propertyName) {
     EdmMapping mockedEdmMapping = EasyMock.createMock(EdmMapping.class);
     if (propertyName.equalsIgnoreCase(SALES_ORDER)) {
-      EasyMock.expect(mockedEdmMapping.getInternalName())
-          .andStubReturn(SALES_ORDER_HEADERS);
+      EasyMock.expect(mockedEdmMapping.getInternalName()).andStubReturn(SALES_ORDER_HEADERS);
     } else {
-      EasyMock.expect(mockedEdmMapping.getInternalName())
-          .andStubReturn(propertyName);
+      EasyMock.expect(mockedEdmMapping.getInternalName()).andStubReturn(propertyName);
     }
     EasyMock.replay(mockedEdmMapping);
     return mockedEdmMapping;
@@ -434,8 +415,7 @@ public class JPAProcessorImplTest {
     try {
       EasyMock.expect(objODataContext.getPathInfo()).andStubReturn(getLocalPathInfo());
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(objODataContext);
     return objODataContext;
@@ -453,8 +433,7 @@ public class JPAProcessorImplTest {
     try {
       uri = new URI(STR_LOCAL_URI);
     } catch (URISyntaxException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     return uri;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/ODataExpressionParserTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/ODataExpressionParserTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/ODataExpressionParserTest.java
index b4d7fc3..6467faa 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/ODataExpressionParserTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/ODataExpressionParserTest.java
@@ -24,9 +24,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.easymock.EasyMock;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmException;
 import org.apache.olingo.odata2.api.edm.EdmFacets;
 import org.apache.olingo.odata2.api.edm.EdmLiteralKind;
@@ -53,6 +50,8 @@ import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.ODataExpressionParser;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.easymock.EasyMock;
+import org.junit.Test;
 
 public class ODataExpressionParserTest {
 
@@ -96,27 +95,20 @@ public class ODataExpressionParserTest {
     try {
       String parsedStr = ODataJPATestConstants.EMPTY_STRING;
       // Simple Binary query -
-      parsedStr = ODataExpressionParser.parseToJPAWhereExpression(
-          getBinaryExpressionMockedObj(BinaryOperator.EQ, ExpressionKind.PROPERTY,
-              SALES_ORDER, SAMPLE_DATA_1), TABLE_ALIAS);
+      parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpressionMockedObj(BinaryOperator.EQ, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1), TABLE_ALIAS);
 
       assertEquals(EXPECTED_STR_1, parsedStr);
       // complex query -
       parsedStr = ODataJPATestConstants.EMPTY_STRING;
 
-      CommonExpression exp1 = getBinaryExpressionMockedObj(
-          BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
-      CommonExpression exp2 = getBinaryExpressionMockedObj(
-          BinaryOperator.NE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
-      parsedStr = ODataExpressionParser.parseToJPAWhereExpression(
-          getBinaryExpression(exp1, BinaryOperator.AND, exp2), TABLE_ALIAS);
+      CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
+      CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.NE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
+      parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.AND, exp2), TABLE_ALIAS);
       assertEquals(EXPECTED_STR_2, parsedStr);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -124,19 +116,12 @@ public class ODataExpressionParserTest {
   public void testMoreThanOneBinaryExpression() {
     // complex query -
     String parsedStr = ODataJPATestConstants.EMPTY_STRING;
-    CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.GE,
-        ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
-    CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.NE,
-        ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
+    CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
+    CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.NE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
     try {
-      parsedStr = ODataExpressionParser.parseToJPAWhereExpression(
-          getBinaryExpression(exp1, BinaryOperator.AND, exp2),
-          TABLE_ALIAS);
+      parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.AND, exp2), TABLE_ALIAS);
       assertEquals(EXPECTED_STR_2, parsedStr);
-      parsedStr = ODataExpressionParser
-          .parseToJPAWhereExpression(
-              getBinaryExpression(exp1, BinaryOperator.OR, exp2),
-              TABLE_ALIAS);
+      parsedStr = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp1, BinaryOperator.OR, exp2), TABLE_ALIAS);
     } catch (ODataException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
@@ -146,10 +131,7 @@ public class ODataExpressionParserTest {
   @Test
   public void testParseFilterExpression() {
     try {
-      assertEquals(EXPECTED_STR_10,
-          ODataExpressionParser.parseToJPAWhereExpression(
-              getFilterExpressionMockedObj(ExpressionKind.PROPERTY,
-                  SALES_ORDER), TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_10, ODataExpressionParser.parseToJPAWhereExpression(getFilterExpressionMockedObj(ExpressionKind.PROPERTY, SALES_ORDER), TABLE_ALIAS));
     } catch (ODataException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
@@ -161,25 +143,17 @@ public class ODataExpressionParserTest {
     String parsedStr1 = ODataJPATestConstants.EMPTY_STRING;
     String parsedStr2 = ODataJPATestConstants.EMPTY_STRING;
 
-    CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.LT,
-        ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
-    CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.LE,
-        ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
+    CommonExpression exp1 = getBinaryExpressionMockedObj(BinaryOperator.LT, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_1);
+    CommonExpression exp2 = getBinaryExpressionMockedObj(BinaryOperator.LE, ExpressionKind.PROPERTY, SALES_ABC, SAMPLE_DATA_XYZ);
 
     try {
-      parsedStr1 = ODataExpressionParser.parseToJPAWhereExpression(
-          (BinaryExpression) getBinaryExpression(exp1,
-              BinaryOperator.AND, exp2), TABLE_ALIAS);
+      parsedStr1 = ODataExpressionParser.parseToJPAWhereExpression((BinaryExpression) getBinaryExpression(exp1, BinaryOperator.AND, exp2), TABLE_ALIAS);
       assertEquals(EXPECTED_STR_4, parsedStr1);
 
-      CommonExpression exp3 = getBinaryExpressionMockedObj(BinaryOperator.GT,
-          ExpressionKind.PROPERTY, SAMPLE_DATA_LINE_ITEMS, SAMPLE_DATA_2);
-      CommonExpression exp4 = getBinaryExpressionMockedObj(BinaryOperator.GE,
-          ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_AMAZON);
+      CommonExpression exp3 = getBinaryExpressionMockedObj(BinaryOperator.GT, ExpressionKind.PROPERTY, SAMPLE_DATA_LINE_ITEMS, SAMPLE_DATA_2);
+      CommonExpression exp4 = getBinaryExpressionMockedObj(BinaryOperator.GE, ExpressionKind.PROPERTY, SALES_ORDER, SAMPLE_DATA_AMAZON);
 
-      parsedStr2 = ODataExpressionParser.parseToJPAWhereExpression(
-          getBinaryExpression(exp3, BinaryOperator.AND, exp4),
-          TABLE_ALIAS);
+      parsedStr2 = ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(exp3, BinaryOperator.AND, exp4), TABLE_ALIAS);
 
     } catch (ODataException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -190,23 +164,8 @@ public class ODataExpressionParserTest {
   @Test
   public void testParseMemberExpression() {
     try {
-      assertEquals(EXPECTED_STR_6,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(
-                  getBinaryExpression(
-                      getMemberExpressionMockedObj(ADDRESS,
-                          CITY),
-                      BinaryOperator.EQ,
-                      getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3)),
-                  TABLE_ALIAS));
-      assertEquals(EXPECTED_STR_7,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(
-                  getBinaryExpression(
-                      getMultipleMemberExpressionMockedObj(ADDRESS, CITY, AREA),
-                      BinaryOperator.EQ,
-                      getLiteralExpressionMockedObj(SAMPLE_DATA_BTM)),
-                  TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_6, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMemberExpressionMockedObj(ADDRESS, CITY), BinaryOperator.EQ, getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3)), TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_7, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMultipleMemberExpressionMockedObj(ADDRESS, CITY, AREA), BinaryOperator.EQ, getLiteralExpressionMockedObj(SAMPLE_DATA_BTM)), TABLE_ALIAS));
     } catch (ODataException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
@@ -215,56 +174,22 @@ public class ODataExpressionParserTest {
   @Test
   public void testParseMethodExpression() {
     try {
-      assertEquals(EXPECTED_STR_12,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(
-                  getBinaryExpression(
-                      getMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'Ru'", "currencyCode", null, 2),
-                      BinaryOperator.EQ,
-                      getLiteralExpressionMockedObj("true")),
-                  TABLE_ALIAS));
-      assertEquals(EXPECTED_STR_13,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(
-                  getBinaryExpression(
-                      getMethodExpressionMockedObj(MethodOperator.SUBSTRING, "currencyCode", "1", "2", 3),
-                      BinaryOperator.EQ,
-                      getLiteralExpressionMockedObj("'NR'")),
-                  TABLE_ALIAS));
-      assertEquals(EXPECTED_STR_14,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(
-                  getBinaryExpression(
-                      getMethodExpressionMockedObj(MethodOperator.TOLOWER, "currencyCode", null, null, 1),
-                      BinaryOperator.EQ,
-                      getLiteralExpressionMockedObj("'inr rupees'")),
-                  TABLE_ALIAS));
-      assertEquals(EXPECTED_STR_15,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(
-                  getBinaryExpression(
-                      getMultipleMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER, "currencyCode", 2, 1),
-                      BinaryOperator.EQ,
-                      getLiteralExpressionMockedObj("true")),
-                  TABLE_ALIAS));
-      assertEquals(EXPECTED_STR_16,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'INR'", null, "currencyCode", 2, null)
-                  /*getBinaryExpression(
-                  		getMemberExpressionMockedObj(ADDRESS,
-                  				CITY),
-                  		BinaryOperator.EQ,
-                  		getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))*/,
-                  TABLE_ALIAS));
-      assertEquals(EXPECTED_STR_17,
-          ODataExpressionParser
-              .parseToJPAWhereExpression(getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER, "currencyCode", 2, 1)
-                  /*getBinaryExpression(
-                  		getMemberExpressionMockedObj(ADDRESS,
-                  				CITY),
-                  		BinaryOperator.EQ,
-                  		getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))*/,
-                  TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_12, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'Ru'", "currencyCode", null, 2), BinaryOperator.EQ, getLiteralExpressionMockedObj("true")), TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_13, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMethodExpressionMockedObj(MethodOperator.SUBSTRING, "currencyCode", "1", "2", 3), BinaryOperator.EQ, getLiteralExpressionMockedObj("'NR'")), TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_14, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMethodExpressionMockedObj(MethodOperator.TOLOWER, "currencyCode", null, null, 1), BinaryOperator.EQ, getLiteralExpressionMockedObj("'inr rupees'")), TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_15, ODataExpressionParser.parseToJPAWhereExpression(getBinaryExpression(getMultipleMethodExpressionMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER, "currencyCode", 2, 1), BinaryOperator.EQ, getLiteralExpressionMockedObj("true")), TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_16, ODataExpressionParser.parseToJPAWhereExpression(getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'INR'", null, "currencyCode", 2, null)
+      /*getBinaryExpression(
+      		getMemberExpressionMockedObj(ADDRESS,
+      				CITY),
+      		BinaryOperator.EQ,
+      		getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))*/, TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_17, ODataExpressionParser.parseToJPAWhereExpression(getFilterExpressionForFunctionsMockedObj(MethodOperator.SUBSTRINGOF, "'nr rupees'", MethodOperator.TOLOWER, "currencyCode", 2, 1)
+      /*getBinaryExpression(
+      		getMemberExpressionMockedObj(ADDRESS,
+      				CITY),
+      		BinaryOperator.EQ,
+      		getLiteralExpressionMockedObj(SAMPLE_DATA_CITY_3))*/, TABLE_ALIAS));
 
     } catch (ODataException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -284,8 +209,7 @@ public class ODataExpressionParserTest {
       parameters.add(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, firstName));
       parameters.add(getLiteralExpressionMockedObj(secondName));
       parameters.add(getLiteralExpressionMockedObj(thirdName));
-    }
-    else if (methodOperator == MethodOperator.TOLOWER) {
+    } else if (methodOperator == MethodOperator.TOLOWER) {
       parameters.add(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, firstName));
     }
 
@@ -334,25 +258,18 @@ public class ODataExpressionParserTest {
   @Test
   public void testParseUnaryExpression() {
 
-    UnaryExpression unaryExpression = getUnaryExpressionMockedObj(
-        getPropertyExpressionMockedObj(ExpressionKind.PROPERTY,
-            "deliveryStatus"),
-        org.apache.olingo.odata2.api.uri.expression.UnaryOperator.NOT);
+    UnaryExpression unaryExpression = getUnaryExpressionMockedObj(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, "deliveryStatus"), org.apache.olingo.odata2.api.uri.expression.UnaryOperator.NOT);
     try {
-      assertEquals(EXPECTED_STR_11, ODataExpressionParser.parseToJPAWhereExpression(
-          unaryExpression, TABLE_ALIAS));
+      assertEquals(EXPECTED_STR_11, ODataExpressionParser.parseToJPAWhereExpression(unaryExpression, TABLE_ALIAS));
     } catch (ODataException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
 
-  private UnaryExpression getUnaryExpressionMockedObj(
-      final CommonExpression operand, final UnaryOperator unaryOperator) {
-    UnaryExpression unaryExpression = EasyMock
-        .createMock(UnaryExpression.class);
-    EasyMock.expect(unaryExpression.getKind())
-        .andStubReturn(ExpressionKind.UNARY);
+  private UnaryExpression getUnaryExpressionMockedObj(final CommonExpression operand, final UnaryOperator unaryOperator) {
+    UnaryExpression unaryExpression = EasyMock.createMock(UnaryExpression.class);
+    EasyMock.expect(unaryExpression.getKind()).andStubReturn(ExpressionKind.UNARY);
     EasyMock.expect(unaryExpression.getOperand()).andStubReturn(operand);
     EasyMock.expect(unaryExpression.getOperator()).andStubReturn(unaryOperator);
 
@@ -360,34 +277,21 @@ public class ODataExpressionParserTest {
     return unaryExpression;
   }
 
-  private CommonExpression getMemberExpressionMockedObj(
-      final String pathUriLiteral, final String propertyUriLiteral) {
-    MemberExpression memberExpression = EasyMock
-        .createMock(MemberExpression.class);
-    EasyMock.expect(memberExpression.getPath())
-        .andStubReturn(
-            getPropertyExpressionMockedObj(ExpressionKind.PROPERTY,
-                pathUriLiteral));
-    EasyMock.expect(memberExpression.getProperty())
-        .andStubReturn(
-            getPropertyExpressionMockedObj(ExpressionKind.PROPERTY,
-                propertyUriLiteral));
-    EasyMock.expect(memberExpression.getKind())
-        .andStubReturn(ExpressionKind.MEMBER);
+  private CommonExpression getMemberExpressionMockedObj(final String pathUriLiteral, final String propertyUriLiteral) {
+    MemberExpression memberExpression = EasyMock.createMock(MemberExpression.class);
+    EasyMock.expect(memberExpression.getPath()).andStubReturn(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, pathUriLiteral));
+    EasyMock.expect(memberExpression.getProperty()).andStubReturn(getPropertyExpressionMockedObj(ExpressionKind.PROPERTY, propertyUriLiteral));
+    EasyMock.expect(memberExpression.getKind()).andStubReturn(ExpressionKind.MEMBER);
 
     EasyMock.replay(memberExpression);
     return memberExpression;
   }
 
   private LiteralExpression getLiteralExpressionMockedObj(final String uriLiteral) {
-    LiteralExpression rightOperandLiteralExpresion = EasyMock
-        .createMock(LiteralExpression.class);
-    EasyMock.expect(rightOperandLiteralExpresion.getKind())
-        .andStubReturn(ExpressionKind.LITERAL);
-    EasyMock.expect(rightOperandLiteralExpresion.getUriLiteral())
-        .andStubReturn(uriLiteral);// SAMPLE_DATA
-    EasyMock.expect(rightOperandLiteralExpresion.getEdmType())
-        .andStubReturn(getEdmSimpleTypeMockedObj(uriLiteral));
+    LiteralExpression rightOperandLiteralExpresion = EasyMock.createMock(LiteralExpression.class);
+    EasyMock.expect(rightOperandLiteralExpresion.getKind()).andStubReturn(ExpressionKind.LITERAL);
+    EasyMock.expect(rightOperandLiteralExpresion.getUriLiteral()).andStubReturn(uriLiteral);// SAMPLE_DATA
+    EasyMock.expect(rightOperandLiteralExpresion.getEdmType()).andStubReturn(getEdmSimpleTypeMockedObj(uriLiteral));
     EasyMock.replay(rightOperandLiteralExpresion);
     return rightOperandLiteralExpresion;
 
@@ -398,11 +302,9 @@ public class ODataExpressionParserTest {
     try {
       EasyMock.expect(edmSimpleType.getName()).andReturn(value);
       EasyMock.expect(edmSimpleType.getKind()).andStubReturn(EdmTypeKind.SIMPLE);
-      EasyMock.expect(edmSimpleType.valueOfString(value, EdmLiteralKind.URI,
-          getEdmFacetsMockedObj(), null)).andStubReturn(value);
+      EasyMock.expect(edmSimpleType.valueOfString(value, EdmLiteralKind.URI, getEdmFacetsMockedObj(), null)).andStubReturn(value);
       EasyMock.expect(edmSimpleType.valueOfString(value, EdmLiteralKind.URI, null, null)).andStubReturn(value);
-      EasyMock.expect(edmSimpleType.valueToString(value, EdmLiteralKind.DEFAULT,
-          getEdmFacetsMockedObj())).andStubReturn(value);
+      EasyMock.expect(edmSimpleType.valueToString(value, EdmLiteralKind.DEFAULT, getEdmFacetsMockedObj())).andStubReturn(value);
       EasyMock.expect(edmSimpleType.valueToString(value, EdmLiteralKind.DEFAULT, null)).andStubReturn(value);
     } catch (EdmException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
@@ -419,8 +321,7 @@ public class ODataExpressionParserTest {
     return facets;
   }
 
-  private PropertyExpression getPropertyExpressionMockedObj(
-      final ExpressionKind expKind, final String propertyName) {
+  private PropertyExpression getPropertyExpressionMockedObj(final ExpressionKind expKind, final String propertyName) {
     PropertyExpression leftOperandPropertyExpresion = EasyMock.createMock(PropertyExpression.class);
     EasyMock.expect(leftOperandPropertyExpresion.getKind()).andStubReturn(ExpressionKind.PROPERTY);
     EasyMock.expect(leftOperandPropertyExpresion.getPropertyName()).andStubReturn(propertyName);
@@ -442,79 +343,50 @@ public class ODataExpressionParserTest {
 
   private EdmMapping getEdmMappingMockedObj(final String propertyName) {
     EdmMapping mockedEdmMapping = EasyMock.createMock(EdmMapping.class);
-    EasyMock.expect(mockedEdmMapping.getInternalName())
-        .andStubReturn(propertyName);
+    EasyMock.expect(mockedEdmMapping.getInternalName()).andStubReturn(propertyName);
     EasyMock.replay(mockedEdmMapping);
     return mockedEdmMapping;
   }
 
-  private BinaryExpression getBinaryExpressionMockedObj(
-      final BinaryOperator operator, final ExpressionKind leftOperandExpKind,
-      final String propertyName, final String literalStr) {
-    BinaryExpression binaryExpression = EasyMock
-        .createMock(BinaryExpression.class);
-    EasyMock.expect(binaryExpression.getKind())
-        .andStubReturn(ExpressionKind.BINARY);
-    EasyMock.expect(binaryExpression.getLeftOperand())
-        .andStubReturn(
-            getPropertyExpressionMockedObj(leftOperandExpKind,
-                propertyName));
+  private BinaryExpression getBinaryExpressionMockedObj(final BinaryOperator operator, final ExpressionKind leftOperandExpKind, final String propertyName, final String literalStr) {
+    BinaryExpression binaryExpression = EasyMock.createMock(BinaryExpression.class);
+    EasyMock.expect(binaryExpression.getKind()).andStubReturn(ExpressionKind.BINARY);
+    EasyMock.expect(binaryExpression.getLeftOperand()).andStubReturn(getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
     EasyMock.expect(binaryExpression.getOperator()).andStubReturn(operator);
-    EasyMock.expect(binaryExpression.getRightOperand())
-        .andStubReturn(getLiteralExpressionMockedObj(literalStr));
+    EasyMock.expect(binaryExpression.getRightOperand()).andStubReturn(getLiteralExpressionMockedObj(literalStr));
 
     EasyMock.replay(binaryExpression);
     return binaryExpression;
   }
 
-  private FilterExpression getFilterExpressionMockedObj(
-      final ExpressionKind leftOperandExpKind, final String propertyName) {
-    FilterExpression filterExpression = EasyMock
-        .createMock(FilterExpression.class);
-    EasyMock.expect(filterExpression.getKind())
-        .andStubReturn(ExpressionKind.FILTER);
-    EasyMock.expect(filterExpression.getExpression())
-        .andStubReturn(
-            getPropertyExpressionMockedObj(leftOperandExpKind,
-                propertyName));
+  private FilterExpression getFilterExpressionMockedObj(final ExpressionKind leftOperandExpKind, final String propertyName) {
+    FilterExpression filterExpression = EasyMock.createMock(FilterExpression.class);
+    EasyMock.expect(filterExpression.getKind()).andStubReturn(ExpressionKind.FILTER);
+    EasyMock.expect(filterExpression.getExpression()).andStubReturn(getPropertyExpressionMockedObj(leftOperandExpKind, propertyName));
 
     EasyMock.replay(filterExpression);
     return filterExpression;
   }
 
-  private FilterExpression getFilterExpressionForFunctionsMockedObj(
-      final MethodOperator methodOperator1, final String firstName, final MethodOperator methodOperator2, final String secondName, final Integer parameterCount1, final Integer parameterCount2) {
+  private FilterExpression getFilterExpressionForFunctionsMockedObj(final MethodOperator methodOperator1, final String firstName, final MethodOperator methodOperator2, final String secondName, final Integer parameterCount1, final Integer parameterCount2) {
     //default value handling of SUBSTRINGOF
-    FilterExpression filterExpression = EasyMock
-        .createMock(FilterExpression.class);
-    EasyMock.expect(filterExpression.getKind())
-        .andStubReturn(ExpressionKind.FILTER);
+    FilterExpression filterExpression = EasyMock.createMock(FilterExpression.class);
+    EasyMock.expect(filterExpression.getKind()).andStubReturn(ExpressionKind.FILTER);
     if ((methodOperator2 != null) && (parameterCount2 != null)) {
-      EasyMock.expect(filterExpression.getExpression())
-          .andStubReturn(
-              getMultipleMethodExpressionMockedObj(methodOperator1, firstName, methodOperator2, secondName, parameterCount1, parameterCount2));
-    }
-    else {
-      EasyMock.expect(filterExpression.getExpression())
-          .andStubReturn(
-              getMethodExpressionMockedObj(methodOperator1, firstName, secondName, null, parameterCount1));
+      EasyMock.expect(filterExpression.getExpression()).andStubReturn(getMultipleMethodExpressionMockedObj(methodOperator1, firstName, methodOperator2, secondName, parameterCount1, parameterCount2));
+    } else {
+      EasyMock.expect(filterExpression.getExpression()).andStubReturn(getMethodExpressionMockedObj(methodOperator1, firstName, secondName, null, parameterCount1));
     }
 
     EasyMock.replay(filterExpression);
     return filterExpression;
   }
 
-  private CommonExpression getBinaryExpression(
-      final CommonExpression leftOperand, final BinaryOperator operator,
-      final CommonExpression rightOperand) {
-    BinaryExpression binaryExpression = EasyMock
-        .createMock(BinaryExpression.class);
-    EasyMock.expect(binaryExpression.getKind())
-        .andStubReturn(ExpressionKind.BINARY);
-    EasyMock.expect(binaryExpression.getLeftOperand())
-        .andStubReturn(leftOperand);
-    EasyMock.expect(binaryExpression.getRightOperand())
-        .andStubReturn(rightOperand);
+  private CommonExpression getBinaryExpression(final CommonExpression leftOperand, final BinaryOperator operator, final CommonExpression rightOperand) {
+    BinaryExpression binaryExpression = EasyMock.createMock(BinaryExpression.class);
+    EasyMock.expect(binaryExpression.getKind()).andStubReturn(ExpressionKind.BINARY);
+    EasyMock.expect(binaryExpression.getLeftOperand()).andStubReturn(leftOperand);
+    EasyMock.expect(binaryExpression.getRightOperand()).andStubReturn(rightOperand);
     EasyMock.expect(binaryExpression.getOperator()).andStubReturn(operator);
 
     EasyMock.replay(binaryExpression);
@@ -533,11 +405,9 @@ public class ODataExpressionParserTest {
     EdmMapping edmMapping = EasyMock.createMock(EdmMapping.class);
     try {
       EasyMock.expect(kpProperty1.getName()).andStubReturn(SAMPLE_DATA_FIELD1);
-      EasyMock.expect(kpProperty1.getType()).andStubReturn(
-          EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance());
+      EasyMock.expect(kpProperty1.getType()).andStubReturn(EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance());
       EasyMock.expect(kpProperty2.getName()).andStubReturn(SAMPLE_DATA_FIELD2);
-      EasyMock.expect(kpProperty2.getType()).andStubReturn(
-          EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
+      EasyMock.expect(kpProperty2.getType()).andStubReturn(EdmSimpleTypeKind.String.getEdmSimpleTypeInstance());
       EasyMock.expect(keyPredicate1.getProperty()).andStubReturn(kpProperty1);
       EasyMock.expect(kpProperty1.getMapping()).andReturn(edmMapping);
       EasyMock.expect(edmMapping.getInternalName()).andReturn(SAMPLE_DATA_FIELD1);
@@ -556,8 +426,7 @@ public class ODataExpressionParserTest {
     String str = null;
 
     try {
-      str = ODataExpressionParser.parseKeyPredicates(keyPredicates,
-          TABLE_ALIAS);
+      str = ODataExpressionParser.parseKeyPredicates(keyPredicates, TABLE_ALIAS);
     } catch (ODataJPARuntimeException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
@@ -573,14 +442,10 @@ public class ODataExpressionParserTest {
     selectedFields.add("BuyerName");
     selectedFields.add("BuyerId");
 
-    assertEquals(EXPECTED_STR_9,
-        ODataExpressionParser.parseToJPASelectExpression(TABLE_ALIAS,
-            selectedFields));
-    assertEquals(TABLE_ALIAS, ODataExpressionParser.parseToJPASelectExpression(
-        TABLE_ALIAS, null));
+    assertEquals(EXPECTED_STR_9, ODataExpressionParser.parseToJPASelectExpression(TABLE_ALIAS, selectedFields));
+    assertEquals(TABLE_ALIAS, ODataExpressionParser.parseToJPASelectExpression(TABLE_ALIAS, null));
 
     selectedFields.clear();
-    assertEquals(TABLE_ALIAS, ODataExpressionParser.parseToJPASelectExpression(
-        TABLE_ALIAS, selectedFields));
+    assertEquals(TABLE_ALIAS, ODataExpressionParser.parseToJPASelectExpression(TABLE_ALIAS, selectedFields));
   }
 }


[07/22] remove @author - javadoc warning

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
index 6b1e1f8..7e725d2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteEntryContent.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.exception.ODataApplicationException;
  * <p>If an expand clause for a navigation property which points to an entry is found this callback will be called.
  * <br>Pointing to an entry means the navigation property has a multiplicity of 0..1 or 1..1.
  * 
- * @author
+ *  
  *
  */
 public interface OnWriteEntryContent extends ODataCallback {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
index 7354e69..1111d54 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnWriteFeedContent.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.exception.ODataApplicationException;
  * <p>If an expand clause for a navigation property which points to a feed is found this callback will be called.
  * <br>Pointing to an feed means the navigation property has a multiplicity of 0..* or 1..*.
  * 
- * @author
+ *  
  *
  */
 public interface OnWriteFeedContent extends ODataCallback {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
index c83a8f6..cbeee19 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadEntryResult.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
  * If inlined navigation property is <code>nullable</code> the {@link ReadEntryResult} has the 
  * <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
  * 
- * @author
+ *  
  *
  */
 public class ReadEntryResult extends ReadResult {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
index e0b871c..edfbad4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadFeedResult.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
  * If inlined navigation property is <code>nullable</code> the {@link ReadFeedResult} has the 
  * <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
  * 
- * @author
+ *  
  */
 public class ReadFeedResult extends ReadResult {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
index 85d462a..9d05b54 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/ReadResult.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderReadProperties;
  * If inlined navigation property is <code>nullable</code> the {@link ReadResult} has the 
  * <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
  * 
- * @author
+ *  
  */
 public abstract class ReadResult {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
index b639364..7c91690 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallback.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.ODataCallback;
  * <p>The callback implementing this interface is registered at the
  * {@link org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties EntityProviderWriteProperties}
  * using the callback key of this class.</p>
- * @author
+ *  
  */
 public interface TombstoneCallback extends ODataCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
index 066e287..ad9f1af 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/TombstoneCallbackResult.java
@@ -23,7 +23,7 @@ import java.util.Map;
 
 /**
  * Objects of this class are a container for the result of the {@link TombstoneCallback}.
- * @author
+ *  
  *
  */
 public class TombstoneCallbackResult {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
index 8ab89f6..d834447 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteCallbackContext.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
 /**
  * Wrapper for {@link WriteEntryCallbackContext} and {@link WriteFeedCallbackContext}.
  * @org.apache.olingo.odata2.DoNotImplement 
- * @author
+ *  
  */
 public abstract class WriteCallbackContext {
   private EdmEntitySet sourceEntitySet;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
index d89d2b5..8b47630 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackContext.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.ep.callback;
 
 /**
  * Context given if the target of an expand is an entry. It contains the source entity set, the navigation property pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
- * @author
+ *  
  *
  */
 public class WriteEntryCallbackContext extends WriteCallbackContext {}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
index ba39874..c632045 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteEntryCallbackResult.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
 
 /**
  * Result of a callback. It contains the data of the entry which is to be expanded as well as the properties of this entry.
- * @author
+ *  
  */
 public class WriteEntryCallbackResult {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
index 50ea34f..f806bb6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackContext.java
@@ -22,7 +22,7 @@ import java.net.URI;
 
 /**
  * Context given if the target of an expand is a feed. It contains the source entity set, the navigation property pointing to the entry which has to be expanded, the current expand select tree node and the data of the source entry.
- * @author
+ *  
  *
  */
 public class WriteFeedCallbackContext extends WriteCallbackContext {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
index d8c18e5..6e37fc3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/WriteFeedCallbackResult.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
 
 /**
  * Result of a callback. It contains the data of the feed which is to be expanded as well as the BaseUri of the feed. Further callbacks for this feed can also be set.
- * @author
+ *  
  *
  */
 public class WriteFeedCallbackResult {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
index 5820351..f17a8df 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/FeedMetadata.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.ep.feed;
 
 /**
  * {@link FeedMetadata} objects contain metadata information about one feed.
- * @author
+ *  
  *
  */
 public interface FeedMetadata {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
index 8e65677..c6ebd4b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/feed/ODataFeed.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
 
 /**
  * An {@link ODataFeed} object contains a list of {@link ODataEntry}s and the metadata associated with this feed.
- * @author
+ *  
  *
  */
 public interface ODataFeed {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
index 9b51269..d1bb948 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/MessageReference.java
@@ -30,7 +30,7 @@ import java.util.List;
  * internationalization and translation of exception messages.
  * <br>Theses classes  contain a {@link MessageReference} object which
  * can be mapped to a related key and message text in the resource bundles.
- * @author
+ *  
  */
 public abstract class MessageReference {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
index c95f6b7..d4be8ec 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataApplicationException.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
  * This class represents a translated application exception. Use this exception class to display custom exception messages. 
  * <br>If a HTTP status is given this exception will result in the set status code like an HTTP exception. 
  * <br>A set status code can be used to show a substatus to a HTTP status as described in the OData protocol specification. 
- * @author
+ *  
  */
 public class ODataApplicationException extends ODataException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
index 422ce76..52afb4f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataBadRequestException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 400 bad request
- * @author
+ *  
  */
 public class ODataBadRequestException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
index 8d3a7b1..12ff78e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataConflictException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 409 Conflict
- * @author
+ *  
  */
 public class ODataConflictException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
index 5207fd8..21c72db 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataException.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.exception;
 
 /**
  * Base exception for all <code>OData</code>-related exceptions.
- * @author
+ *  
  */
 public class ODataException extends Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
index ed927c2..92e0dbb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataForbiddenException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 403 forbidden
- * @author
+ *  
  */
 public class ODataForbiddenException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
index d17d9b7..f412de1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataHttpException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * {@link ODataMessageException} with a HTTP status code.
- * @author
+ *  
  */
 public abstract class ODataHttpException extends ODataMessageException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
index 6d6f4cc..759e941 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMessageException.java
@@ -27,7 +27,7 @@ package org.apache.olingo.odata2.api.exception;
  * <br>To support internationalization and translation of messages, this class
  * and its sub classes contain a {@link MessageReference} object which can be
  * mapped to a related key and message text in the resource bundles.
- * @author
+ *  
  */
 public abstract class ODataMessageException extends ODataException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
index 1fd29f2..d9250bf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataMethodNotAllowedException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 405 (method not allowed).
- * @author
+ *  
  */
 public class ODataMethodNotAllowedException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
index 2b4c7eb..cca88ba 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotAcceptableException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 406 not acceptable
- * @author
+ *  
  */
 public class ODataNotAcceptableException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
index c1ecc5a..622c81e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotFoundException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 404 not found
- * @author
+ *  
  */
 public class ODataNotFoundException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
index 3a72eb4..798addf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataNotImplementedException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 501 (Not implemented).
- * @author
+ *  
  */
 public class ODataNotImplementedException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
index 1bda675..4f40682 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionFailedException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP Status 412 Precondition Failed.
- * @author
+ *  
  */
 public class ODataPreconditionFailedException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
index 0069e34..c94c8db 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataPreconditionRequiredException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 428 precondition required
- * @author
+ *  
  */
 public class ODataPreconditionRequiredException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
index cf734ee..9e8962b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataServiceUnavailableException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 503 service unavailable
- * @author
+ *  
  */
 public class ODataServiceUnavailableException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
index 667ec8c..64938aa 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/exception/ODataUnsupportedMediaTypeException.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Exceptions of this class will result in a HTTP status 415 unsupported media type
- * @author
+ *  
  */
 public class ODataUnsupportedMediaTypeException extends ODataHttpException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
index 39e5b6e..b09c9e8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataContext.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
 
 /**
  * Compilation of generic context objects.
- * @author
+ *  
  * @org.apache.olingo.odata2.DoNotImplement
  */
 public interface ODataContext {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
index b385910..6552cdd 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorCallback.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.ODataApplicationException;
 
 /**
  * This interface is called if an error occurred and is process inside the exception mapper.
- * @author
+ *  
  *
  */
 public interface ODataErrorCallback extends ODataCallback {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
index 2590fbe..a36a24b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataErrorContext.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
  * Error context information bean. Usually created and in error situations.
  * @see org.apache.olingo.odata2.api.ep.EntityProvider EntityProvider
  * @see ODataErrorCallback
- * @author
+ *  
  */
 public class ODataErrorContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
index d3a4d74..4cefaf6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataProcessor.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
  * An <code>ODataProcessor</code> is the root interface for processor implementation.
  * A processor handles OData requests like reading or writing entities. All possible
  * actions are defined in the {@link org.apache.olingo.odata2.api.processor.feature} package.
- * @author
+ *  
  * @org.apache.olingo.odata2.DoNotImplement
  */
 public interface ODataProcessor {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
index 45b3278..1074226 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataRequest.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
 
 /**
  * 
- * @author
+ *  
  */
 public abstract class ODataRequest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
index 81d1bf1..8701051 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataResponse.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
  * ODataResponse response = ODataResponse.entity("hello world").setStatus(HttpStatusCodes.OK).build();
  * }
  * </pre>
- * @author
+ *  
  */
 public abstract class ODataResponse {
 
@@ -144,7 +144,7 @@ public abstract class ODataResponse {
 
   /**
    * Implementation of the builder pattern to create instances of this type of object. 
-   * @author
+   *  
    */
   public static abstract class ODataResponseBuilder {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
index bfac971..7e033c6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/ODataSingleProcessor.java
@@ -75,7 +75,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
  * {@link ODataNotImplementedException} for all other requests.
  * Sub classes have to override only methods they want to support.</p> 
  * 
- * @author
+ *  
  */
 public abstract class ODataSingleProcessor implements MetadataProcessor, ServiceDocumentProcessor, EntityProcessor, EntitySetProcessor, EntityComplexPropertyProcessor, EntityLinkProcessor, EntityLinksProcessor, EntityMediaProcessor, EntitySimplePropertyProcessor, EntitySimplePropertyValueProcessor, FunctionImportProcessor, FunctionImportValueProcessor, BatchProcessor, CustomContentType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
index 1e05622..3a1719f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/CustomContentType.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.processor.ODataProcessor;
  * various types like Json (application/json), Atom (application/xml+atom) and XML (application/xml). But
  * the OData specification allows also other types like e.g. CSV or plain text.  
  * 
- * @author
+ *  
  */
 public interface CustomContentType extends ODataProcessorFeature {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
index aea3b5e..f694535 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/feature/ODataProcessorFeature.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.processor.feature;
  * the OData library can request additional information from the processor to change
  * control over request handling. 
  * 
- * @author
+ *  
  */
 public interface ODataProcessorFeature {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
index b9f502b..46b8893 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/BatchProcessor.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
 /**
  * Execute a OData batch request. 
  * 
- * @author
+ *  
  *
  */
 public interface BatchProcessor extends ODataProcessor {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
index 5ee1e33..2d962bd 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityComplexPropertyProcessor.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 /**
  * Execute a OData complex property request. 
  * 
- * @author
+ *  
  */
 public interface EntityComplexPropertyProcessor extends ODataProcessor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
index 5b7c882..bdbc249 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinkProcessor.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 /**
  * Execute an OData entity link request. 
  * 
- * @author
+ *  
  */
 public interface EntityLinkProcessor extends ODataProcessor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
index 7d0a7e2..d81c924 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityLinksProcessor.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.uri.info.PostUriInfo;
 /**
  * Execute a OData entity links request. 
  * 
- * @author
+ *  
  */
 public interface EntityLinksProcessor extends ODataProcessor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
index 9741b0d..a71d3a9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityMediaProcessor.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 
 /**
  * Execute an OData entity media request
- * @author
+ *  
  */
 public interface EntityMediaProcessor extends ODataProcessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
index 006b7aa..fc36917 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntityProcessor.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 /**
  * Execute a OData entity request. 
  * 
- * @author
+ *  
  */
 public interface EntityProcessor extends ODataProcessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
index 8d4fc32..bbe8366 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySetProcessor.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.uri.info.PostUriInfo;
 /**
  * Execute a OData entity set request. 
  * 
- * @author
+ *  
  *
  */
 public interface EntitySetProcessor extends ODataProcessor {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
index 017092d..9c04db6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyProcessor.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 /**
  * Execute a OData entity simple property request. 
  * 
- * @author
+ *  
  */
 public interface EntitySimplePropertyProcessor extends ODataProcessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
index 24a55b8..276a3cb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/EntitySimplePropertyValueProcessor.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 /**
  * Execute a OData entity simple property value request. 
  * 
- * @author
+ *  
  */
 public interface EntitySimplePropertyValueProcessor extends ODataProcessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
index 04fa209..e18a5f1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportProcessor.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.info.GetFunctionImportUriInfo;
 
 /**
  * Execute an OData function import request. 
- * @author
+ *  
  */
 public interface FunctionImportProcessor extends ODataProcessor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
index 3f2ec08..16f6f25 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/FunctionImportValueProcessor.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.info.GetFunctionImportUriInfo;
 
 /**
  * Execute an OData function import value request.
- * @author
+ *  
  */
 public interface FunctionImportValueProcessor extends ODataProcessor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
index 53be8a6..729d247 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/MetadataProcessor.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
 /**
  * Execute a OData metadata request. 
  * 
- * @author
+ *  
  */
 public interface MetadataProcessor extends ODataProcessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
index 23642e3..51a8e07 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/processor/part/ServiceDocumentProcessor.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
 /**
  * Execute a OData service document request. 
  * 
- * @author
+ *  
  */
 public interface ServiceDocumentProcessor extends ODataProcessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
index 04f74bc..6590bc5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/rt/RuntimeDelegate.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.uri.UriParser;
  * by internal abstract API implementations and it is not intended to be used by others. 
  * 
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public abstract class RuntimeDelegate {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
index a2bebf1..0414a37 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Accept.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.servicedocument;
 /**
  * An Accept element
  * <p>Accept element indicates the types of representation accepted by the Collection
- * @author
+ *  
  */
 public interface Accept {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
index dcacf4f..755969e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/AtomInfo.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * A AtomInfo
  * <p>AtomInfo represents the structure of Service Document according RFC 5023 (for ATOM format) 
- * @author
+ *  
  */
 public interface AtomInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
index 6c62749..3e812b6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Categories.java
@@ -24,7 +24,7 @@ import java.util.List;
  * A Categories element
  * <p>Categories element provides a list of the categories that can be applied to the members of a Collection
  * <p>If the "href" attribute is provided, the Categories element MUST be empty and MUST NOT have the "fixed" or "scheme" attributes
- * @author
+ *  
  */
 
 public interface Categories {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
index 89441fd..02da322 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Category.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.servicedocument;
 /**
  * A Category element
  * <p>Category element 
- * @author
+ *  
  */
 public interface Category {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
index 026dc42..d2728eb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Collection.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * A Collection
  * <p>Collection element describes a Collection
- * @author
+ *  
  */
 public interface Collection {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
index fe41e8d..9c0fb44 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/CommonAttributes.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * A CommonAttributes
- * @author
+ *  
  */
 public interface CommonAttributes {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
index c097bb2..9aad659 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionAttribute.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.servicedocument;
 /**
  * A ExtensionAttribute
  * <p>ExtensionAttribute is an attribute of an extension element
- * @author
+ *  
  */
 public interface ExtensionAttribute {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
index ab77653..ea65cc5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ExtensionElement.java
@@ -24,7 +24,7 @@ import java.util.List;
  * A ExtensionElement
  * <p>ExtensionElement is an element that is defined in any namespace except 
  * the namespace "app"
- * @author
+ *  
  */
 public interface ExtensionElement {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
index 9152cc6..d8fc60e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Fixed.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.servicedocument;
 * Fixed
 * <p>Fixed indicates whether the list of categories is a fixed or an open set
 * Fixed can either be yes or no
-* @author
+*  
 */
 public enum Fixed {
   YES, NO;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
index e717a45..f5748ca 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocument.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderException;
 /**
  * A Service document
  * <p>Service document lists all EntitySets
- * @author
+ *  
  */
 public interface ServiceDocument {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
index 0323906..74015fe 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParser.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.servicedocument;
 import java.io.InputStream;
 
 /**
- * @author
+ *  
  */
 public interface ServiceDocumentParser {
   public ServiceDocument parseXml(InputStream in) throws ServiceDocumentParserException;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
index 6a19419..79c1068 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/ServiceDocumentParserException.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.odata2.api.servicedocument;
 
 /**
- * @author
+ *  
  */
 public class ServiceDocumentParserException extends Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
index 61481a7..03a51f8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Title.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.servicedocument;
 /**
  * A Title element
  * <p>Title element gives a human-readable title
- * @author
+ *  
  */
 public interface Title {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
index 60c16b2..d422df5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/servicedocument/Workspace.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * A Workspace element
  * <p>Workspaces are server-defined groups of Collections. 
- * @author
+ *  
  */
 public interface Workspace {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
index 742056b..a4ea7c3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/ExpandSelectTreeNode.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
 /**
  * Expression tree node with information about selected properties and to be expanded links.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface ExpandSelectTreeNode {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
index d3d5315..086dc85 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/KeyPredicate.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
 /**
  * Key predicate, consisting of a simple-type property and its value as String literal
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface KeyPredicate {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
index b1e4b9c..c72080a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationPropertySegment.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
  * Navigation property segment, consisting of a navigation property and its
  * target entity set.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface NavigationPropertySegment {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
index 9435ba4..2ce7a26 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/NavigationSegment.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
  * and, optionally, a list of key predicates to determine a single entity out of
  * the target entity set.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface NavigationSegment {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
index be9365b..daa64ab 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathInfo.java
@@ -24,7 +24,7 @@ import java.util.List;
 /**
  * Object to keep OData URI information.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface PathInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
index 2f0ea73..7f5b3f7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/PathSegment.java
@@ -30,7 +30,7 @@ import java.util.Map;
  * and the matrix parameter <code>mul</code> has a multi-value list.</p> 
  *
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface PathSegment {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
index 618da5d..abf7975 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/SelectItem.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
 /**
  * An item of a $select system query option.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface SelectItem {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
index dd5ec8d..c8b64a9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriInfo.java
@@ -52,7 +52,7 @@ import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 /**
  * Structured parts of the request URI - the result of URI parsing.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  * @see UriParser
  */
 public interface UriInfo extends GetServiceDocumentUriInfo,

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
index 54009e7..0eb9352 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriNotMatchingException.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.ODataNotFoundException;
 
 /**
  * URI-parsing exception resulting in a 404 Not Found response.
- * @author
+ *  
  */
 public class UriNotMatchingException extends ODataNotFoundException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
index ffcc6e9..ff83bc3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriParser.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
 
 /**
  * Wrapper for UriParser functionality.
- * @author
+ *  
  */
 public abstract class UriParser {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
index 6102301..52e1782 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/UriSyntaxException.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
 /**
  * Exception for violation of the OData URI construction rules,
  * resulting in a 400 Bad Request response.
- * @author
+ *  
  */
 public class UriSyntaxException extends ODataBadRequestException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
index 2b51eef..40893a7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryExpression.java
@@ -27,7 +27,7 @@ package org.apache.olingo.odata2.api.uri.expression;
  * A binary expression node is inserted in the expression tree for any valid
  * ODATA binary operator in {@link BinaryOperator} (e.g. for "and", "div", "eg", ... )
  * <br>
- * @author
+ *  
  */
 public interface BinaryExpression extends CommonExpression {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
index 8ebf0b8..93140f4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/BinaryOperator.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.uri.expression;
 /**
  * Enumerations for supported binary operators of the ODATA expression parser 
  * for ODATA version 2.0 (with some restrictions)
- * @author
+ *  
 */
 public enum BinaryOperator {
   AND("and"), OR("or"), EQ("eq"), NE("ne"), LT("lt"), LE("le"), GT("gt"), GE("ge"), ADD("add"), SUB("sub"), MUL("mul"), DIV("div"), MODULO("mod"),

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
index 71ef560..04a99ec 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/CommonExpression.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.edm.EdmType;
  * <p>This interface defines the default methods for all expression tree nodes 
  * <br>
  * <br>
- * @author
+ *  
  */
 public interface CommonExpression extends Visitable {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
index 4543921..5007c2a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExceptionVisitExpression.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
 
 /**
  * Exception thrown while traversing/visiting a filter expression tree
- * @author
+ *  
  */
 public class ExceptionVisitExpression extends ODataMessageException {
   private static final long serialVersionUID = 7701L;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
index d4b987c..ad666c6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionKind.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.uri.expression;
 
 /**
  * Enumeration describing all possible node types inside an expression tree
- * @author
+ *  
  */
 public enum ExpressionKind {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
index e86a62f..68d199e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionParserException.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.ODataBadRequestException;
 
 /**
  * Exception thrown while parsing a filter or orderby expression
- * @author
+ *  
  */
 public class ExpressionParserException extends ODataBadRequestException {
   private static final long serialVersionUID = 7702L;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
index 775b6f2..8b1da90 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/ExpressionVisitor.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.edm.EdmTyped;
  * Any class instance implementing this interface can be passed to the method {@link Visitable#accept(ExpressionVisitor)}
  * of an expression node to start the traversing. While traversing, the appropriate methods of the visitor implementation
  * will be called.
- * @author
+ *  
  */
 public interface ExpressionVisitor {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
index 5245eb5..65c1bb2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/FilterExpression.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.uri.expression;
  * Represents a $filter expression in the expression tree returned by {@link org.apache.olingo.odata2.api.uri.UriParser#parseFilterString(org.apache.olingo.odata2.api.edm.EdmEntityType, String)}
  * Used to define the <b>root</b> expression node in an $filter expression tree. 
  * 
- * @author
+ *  
  */
 public interface FilterExpression extends CommonExpression {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
index 46ea92b..e8e6819 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/LiteralExpression.java
@@ -32,7 +32,7 @@ package org.apache.olingo.odata2.api.uri.expression;
  * with a literal expression node for "12".
  * <br>
  * <br>
- * @author
+ *  
  */
 public interface LiteralExpression extends CommonExpression {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
index 8aefc02..8bc20e8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MemberExpression.java
@@ -32,7 +32,7 @@ package org.apache.olingo.odata2.api.uri.expression;
  * containing a member expression node for accessing property "city" which is part of the 
  * complex property "address". Method {@link #getPath()} will return a reference to the "address" property,
  * method {@link #getProperty()} will return a refence to the "city" property.
- * @author
+ *  
  */
 public interface MemberExpression extends CommonExpression {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
index 212e3c2..bb455d8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodExpression.java
@@ -30,7 +30,7 @@ import java.util.List;
  * OData method operator in {@link MethodOperator} (e.g. for "substringof", "concat", "year", ... )
  * <br>
  * <br>
- * @author
+ *  
  */
 public interface MethodExpression extends CommonExpression {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
index 21338bd..2b9266d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/MethodOperator.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.uri.expression;
 /**
  * Enumerations for all supported methods of the ODATA expression parser 
  * for ODATA version 2.0 (with some restrictions). 
- * @author
+ *  
  */
 public enum MethodOperator {
   ENDSWITH("endswith"), INDEXOF("indexof"), STARTSWITH("startswith"), TOLOWER("tolower"), TOUPPER("toupper"), TRIM("trim"), SUBSTRING("substring"), SUBSTRINGOF("substringof"), CONCAT("concat"), LENGTH("length"), YEAR("year"), MONTH("month"), DAY("day"), HOUR("hour"), MINUTE("minute"), SECOND("second"), ROUND("round"), FLOOR("floor"), CEILING("ceiling");

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
index 89ad2f2..76574bb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderByExpression.java
@@ -25,7 +25,7 @@ import java.util.List;
  * {@link org.apache.olingo.odata2.api.uri.UriParser#parseOrderByString(org.apache.olingo.odata2.api.edm.EdmEntityType, String) }
  * Used to define the <b>root</b> expression node in an $filter expression tree.
  * 
- * @author
+ *  
  */
 public interface OrderByExpression extends CommonExpression {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
index 1e19e89..8a9ac15 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/OrderExpression.java
@@ -28,7 +28,7 @@ package org.apache.olingo.odata2.api.uri.expression;
  * will be inserted into the expression tree
  * <br>
  * <br>
- * @author
+ *  
  */
 public interface OrderExpression extends CommonExpression {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
index e27a203..23076d3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/PropertyExpression.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.edm.EdmTyped;
  * against the EDM.
  * <br>
  * <br>
- * @author
+ *  
  */
 public interface PropertyExpression extends CommonExpression {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
index df95430..5b1bcdb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/SortOrder.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.uri.expression;
 
 /**
  * Enumeration describing all possible sort orders used in an $orderby expression 
- * @author
+ *  
  */
 public enum SortOrder {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
index 9c11d19..9cb2512 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryExpression.java
@@ -28,7 +28,7 @@ package org.apache.olingo.odata2.api.uri.expression;
  * ODATA unary operator in {@link UnaryOperator} (e.g. for "not or "-" )
  * <br>
  * <br>
- * @author
+ *  
  */
 public interface UnaryExpression extends CommonExpression {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
index 668c7c9..2a44bc6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/UnaryOperator.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.uri.expression;
 /**
  * Enumerations for supported unary operators of the OData expression parser
  * for OData version 2.0
- * @author 
+ *   
  */
 public enum UnaryOperator {
   MINUS("-", "negation"), NOT("not");


[06/22] remove @author - javadoc warning

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
index f285d47..5637b82 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/expression/Visitable.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataApplicationException;
  * The interface {@link Visitable} is part of the visitor pattern used to traverse 
  * the expression tree build from a $filter expression string or $orderby expression string.
  * It is implemented by each class used as node in an expression tree.
- * @author
+ *  
  * @see ExpressionVisitor
  *
  */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
index fb550aa..9b172db 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/DeleteUriInfo.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
 /**
  * Access to the parts of the request URI that are relevant for DELETE requests.
  * @org.apache.olingo.odata2.DoNotImplement
-* @author
+*  
 */
 public interface DeleteUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
index 7e6edef..bb88f2a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetComplexPropertyUriInfo.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
  * Access to the parts of the request URI that are relevant for GET requests
  * of complex properties.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetComplexPropertyUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
index 2a9636a..e729ba3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityCountUriInfo.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the count of a single entity (also known as existence check).
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntityCountUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
index 4add423..b839a78 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkCountUriInfo.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the number of links to a single entity (also known as existence check).
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntityLinkCountUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
index 897b852..b593c73 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityLinkUriInfo.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the URI of a single entity.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntityLinkUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
index 4d3b02b..e06e5f0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetCountUriInfo.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the number of entities.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntitySetCountUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
index f447957..bf29b83 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksCountUriInfo.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the number of links to entities.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntitySetLinksCountUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
index d3ec5b7..1a7eaad 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetLinksUriInfo.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the URIs of entities.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntitySetLinksUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
index cc530d6..f8cb7f9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntitySetUriInfo.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
  * Access to the parts of the request URI that are relevant for GET requests
  * of entities.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntitySetUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
index 0c09fec..5b1afa9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetEntityUriInfo.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
  * Access to the parts of the request URI that are relevant for GET requests
  * of a single entity.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetEntityUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
index 267b0d9..5f50100 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetFunctionImportUriInfo.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.EdmLiteral;
  * Access to the parts of the request URI that are relevant for requests
  * of function imports.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetFunctionImportUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
index a354ffa..80ccfc4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMediaResourceUriInfo.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the media resource of a single entity.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetMediaResourceUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
index 46deabf..9e9e9ee 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetMetadataUriInfo.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the metadata document.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetMetadataUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
index 3058a3e..a12b75f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetServiceDocumentUriInfo.java
@@ -24,7 +24,7 @@ import java.util.Map;
  * Access to the parts of the request URI that are relevant for GET requests
  * of the service document.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetServiceDocumentUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
index 1e6f87d..bcd20cc 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/GetSimplePropertyUriInfo.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
  * Access to the parts of the request URI that are relevant for GET requests
  * of simple properties.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface GetSimplePropertyUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
index 91dfde2..d3356c6 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PostUriInfo.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.uri.NavigationSegment;
 /**
  * Access to the parts of the request URI that are relevant for POST requests.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface PostUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
index bf5f6c8..7505c86 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/uri/info/PutMergePatchUriInfo.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
 /**
  * Access to the parts of the request URI that are relevant for PUT, PATCH, or MERGE requests.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface PutMergePatchUriInfo {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
index 3062ea7..f9767c3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ContentNegotiator.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
 import org.apache.olingo.odata2.core.uri.UriType;
 
 /**
- * @author
+ *  
  */
 public class ContentNegotiator {
   private static final String URI_INFO_FORMAT_JSON = "json";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
index 9571600..f0db8af 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/Dispatcher.java
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
 
 /**
  * Request dispatching according to URI type and HTTP method.
- * @author
+ *  
  */
 public class Dispatcher {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
index c30a52d..a820742 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataContextImpl.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
 import org.apache.olingo.odata2.core.debug.ODataDebugResponseWrapper;
 
 /**
- * @author
+ *  
  */
 public class ODataContextImpl implements ODataContext {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
index 3d45476..ada0e30 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataExceptionWrapper.java
@@ -55,7 +55,7 @@ import org.apache.olingo.odata2.core.exception.MessageService.Message;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class ODataExceptionWrapper {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
index dee2c3c..48948ac 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataPathSegmentImpl.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import org.apache.olingo.odata2.api.uri.PathSegment;
 
 /**
- * @author
+ *  
  */
 public class ODataPathSegmentImpl implements PathSegment {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
index a20cc52..63ced0f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
@@ -60,7 +60,7 @@ import org.apache.olingo.odata2.core.uri.UriParserImpl;
 import org.apache.olingo.odata2.core.uri.UriType;
 
 /**
- * @author
+ *  
  */
 public class ODataRequestHandler {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
index 943969f..d1ff73e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestImpl.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
 import org.apache.olingo.odata2.core.commons.ContentType;
 
 /**
- * @author
+ *  
  */
 public class ODataRequestImpl extends ODataRequest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
index 603aede..3131dd3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataResponseImpl.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.api.processor.ODataResponse;
 
 /**
- * @author
+ *  
  */
 public class ODataResponseImpl extends ODataResponse {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
index 6c9e126..301d6f0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/PathInfoImpl.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
 import org.apache.olingo.odata2.api.uri.PathSegment;
 
 /**
- * @author
+ *  
  */
 public class PathInfoImpl implements PathInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
index ee23431..53a5b96 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/AcceptParser.java
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
 import org.apache.olingo.odata2.api.batch.BatchException;
 
 /**
- * @author
+ *  
  */
 public class AcceptParser {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
index b278dcc..0b4e6bd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.commons.Decoder;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class BatchRequestParser {
   private static final String LF = "\n";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
index 82c0944..409a491 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/ContentType.java
@@ -70,7 +70,7 @@ import java.util.TreeMap;
  * 
  * Once created a {@link ContentType} is <b>IMMUTABLE</b>.
  * 
- * @author
+ *  
  */
 public class ContentType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
index 2e799da..ddf3586 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Decoder.java
@@ -23,7 +23,7 @@ import java.io.UnsupportedEncodingException;
 /**
  * Decodes a Java String containing a percent-encoded UTF-8 String value
  * into a Java String (in its internal UTF-16 encoding).
- * @author
+ *  
  */
 public class Decoder {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
index 99d5ec1..5cd6bf2 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
@@ -25,7 +25,7 @@ import java.io.UnsupportedEncodingException;
  * percent-encoded UTF-8 representation according to
  * <a href="http://www.ietf.org/rfc/rfc3986.txt">RFC 3986</a>
  * (with consideration of its predecessor RFC 2396).
- * @author
+ *  
  */
 public class Encoder {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
index 31a4bcd..ae3801a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfo.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public interface DebugInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
index a4856b6..9d11914 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoBody.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.core.ep.BasicEntityProvider;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public class DebugInfoBody implements DebugInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
index 71bd06c..ec2c9bf 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoException.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 import org.apache.olingo.odata2.core.exception.MessageService;
 
 /**
- * @author
+ *  
  */
 public class DebugInfoException implements DebugInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
index cbf513d..c99a3f3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRequest.java
@@ -26,7 +26,7 @@ import java.util.Map;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public class DebugInfoRequest implements DebugInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
index 02de450..aa0d8da 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoResponse.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public class DebugInfoResponse implements DebugInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
index 6f17596..65ab05a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoRuntime.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.processor.ODataContext.RuntimeMeasurement;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public class DebugInfoRuntime implements DebugInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
index af87c40..d535ce5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/DebugInfoUri.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.core.uri.ExpandSelectTreeNodeImpl;
 import org.apache.olingo.odata2.core.uri.expression.JsonVisitor;
 
 /**
- * @author
+ *  
  */
 public class DebugInfoUri implements DebugInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
index 993af4f..56b45d4 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapper.java
@@ -42,7 +42,7 @@ import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 /**
  * Wraps an OData response into an OData response containing additional
  * information useful for support purposes.
- * @author
+ *  
  */
 public class ODataDebugResponseWrapper {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
index fdfacde..3ba2472 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/AbstractSimpleType.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.edm.EdmTypeKind;
 
 /**
  * Abstract implementation of the EDM simple-type interface.
- * @author
+ *  
  */
 public abstract class AbstractSimpleType implements EdmSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
index f8d21c0..a20d2e5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Bit.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the internal simple type Bit.
- * @author
+ *  
  */
 public class Bit extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
index d30366d..5485163 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBinary.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Binary.
- * @author
+ *  
  */
 public class EdmBinary extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
index dc9bb0a..a325101 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmBoolean.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Boolean.
- * @author
+ *  
  */
 public class EdmBoolean extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
index 478c132..909eef2 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmByte.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Byte.
- * @author
+ *  
  */
 public class EdmByte extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
index 9d0b17a..2370a06 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTime.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type DateTime.
- * @author
+ *  
  */
 public class EdmDateTime extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
index 730db11..bb3295b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDateTimeOffset.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
  * 
  * Details about parsing of time strings to {@link EdmDateTimeOffset} objects can be found in {@link org.apache.olingo.odata2.api.edm.EdmSimpleType} documentation.
  * 
- * @author
+ *  
  */
 public class EdmDateTimeOffset extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
index 84e9b1d..dfec75a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDecimal.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Decimal.
- * @author
+ *  
  */
 public class EdmDecimal extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
index 794a4f4..824e1c5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmDouble.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Double.
- * @author
+ *  
  */
 public class EdmDouble extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
index 9249a1f..d60815a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmGuid.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Guid.
- * @author
+ *  
  */
 public class EdmGuid extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
index 478f655..ca9d387 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmImpl.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.exception.ODataException;
 
 /**
- * @author
+ *  
  */
 public abstract class EdmImpl implements Edm {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
index 2b5aa2d..4f81303 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt16.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Int16.
- * @author
+ *  
  */
 public class EdmInt16 extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
index e599d47..ce2fcbd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt32.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Int32.
- * @author
+ *  
  */
 public class EdmInt32 extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
index 52bd550..ef3f0a1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmInt64.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Int64.
- * @author
+ *  
  */
 public class EdmInt64 extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
index c9dbfa9..b33eb32 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmNull.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the simple type Null.
- * @author
+ *  
  */
 public class EdmNull extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
index cce8fd4..78c040c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSByte.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type SByte.
- * @author
+ *  
  */
 public class EdmSByte extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
index 50acc7b..e078097 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeImpl.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class EdmSimpleTypeFacadeImpl implements EdmSimpleTypeFacade {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
index 06776a6..257e7f8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmSingle.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type Single.
- * @author
+ *  
  */
 public class EdmSingle extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
index 4411481..ac43aac 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmString.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the EDM simple type String.
- * @author
+ *  
  */
 public class EdmString extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
index 04fda8a..99d273e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/EdmTime.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
  * The time value is interpreted and formatted as local time.</p>
  * <p>Formatting simply ignores the year, month, and day parts of time instances.
  * Parsing returns a Calendar object where all unused fields have been cleared.</p>
- * @author
+ *  
  */
 public class EdmTime extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
index 1d5a91f..9c3f801 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/Uint7.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeException;
 
 /**
  * Implementation of the internal simple type "unsigned 7-bit integer".
- * @author
+ *  
  */
 public class Uint7 extends AbstractSimpleType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
index 4ba5340..285760a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexPropertyImplProv.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.edm.EdmType;
 import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
 
 /**
- * @author
+ *  
  */
 public class EdmComplexPropertyImplProv extends EdmPropertyImplProv {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
index 00d0f96..c26f8fd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmElementImplProv.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
- * @author
+ *  
  */
 public abstract class EdmElementImplProv extends EdmTypedImplProv implements EdmElement {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
index 074990e..ae0b1c3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProv.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImport;
 import org.apache.olingo.odata2.api.exception.ODataException;
 
 /**
- * @author
+ *  
  */
 public class EdmEntityContainerImplProv implements EdmEntityContainer, EdmAnnotatable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
index c04f5ed..67ddc44 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProv.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImportParameter;
 import org.apache.olingo.odata2.api.edm.provider.ReturnType;
 
 /**
- * @author
+ *  
  */
 public class EdmFunctionImportImplProv extends EdmNamedImplProv implements EdmFunctionImport, EdmAnnotatable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
index aebcebc..32cf7c4 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmParameterImplProv.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImportParameter;
 import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
 
 /**
- * @author
+ *  
  */
 public class EdmParameterImplProv extends EdmElementImplProv implements EdmParameter, EdmAnnotatable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
index 1795c9b..bf67ecc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProv.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.core.ep.producer.XmlMetadataProducer;
 import org.apache.olingo.odata2.core.ep.util.CircleStreamBuffer;
 
 /**
- * @author
+ *  
  */
 public class EdmServiceMetadataImplProv implements EdmServiceMetadata {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
index fb50f67..dc43476 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmStructuralTypeImplProv.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.edm.provider.Property;
 import org.apache.olingo.odata2.api.edm.provider.SimpleProperty;
 
 /**
- * @author
+ *  
  */
 public abstract class EdmStructuralTypeImplProv extends EdmNamedImplProv implements EdmStructuralType, EdmAnnotatable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
index db4f61e..5459a49 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/edm/provider/EdmTypedImplProv.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
 
 /**
- * @author
+ *  
  */
 public class EdmTypedImplProv extends EdmNamedImplProv implements EdmTyped {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
index 2dc0d3f..41a71ec 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/AtomEntityProvider.java
@@ -66,7 +66,7 @@ import org.apache.olingo.odata2.core.ep.util.CircleStreamBuffer;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class AtomEntityProvider implements ContentTypeBasedEntityProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
index 8622500..931c5a6 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/BasicEntityProvider.java
@@ -58,7 +58,7 @@ import org.apache.olingo.odata2.core.ep.util.CircleStreamBuffer;
 /**
  * Provider for all basic (content type independent) entity provider methods.
  * 
- * @author
+ *  
  */
 public class BasicEntityProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
index e423755..f72db16 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ContentTypeBasedEntityProvider.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.servicedocument.ServiceDocument;
 /**
  * Interface for all none basic (content type <b>dependent</b>) provider methods.
  * 
- * @author
+ *  
  */
 public interface ContentTypeBasedEntityProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
index 7a32567..aa0056c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/JsonEntityProvider.java
@@ -62,7 +62,7 @@ import org.apache.olingo.odata2.core.ep.util.CircleStreamBuffer;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class JsonEntityProvider implements ContentTypeBasedEntityProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
index d580e8b..42c04b9 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImpl.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.edm.provider.EdmImplProv;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class ProviderFacadeImpl implements EntityProviderInterface {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
index f5ff54f..566faba 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregator.java
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
 /**
  * Aggregator to get easy and fast access to all for serialization and de-serialization necessary {@link EdmEntitySet} informations.
  * 
- * @author
+ *  
  */
 public class EntityInfoAggregator {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
index a2703d8..7f96671 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityPropertyInfo.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.EdmType;
 
 /**
  * Collects informations about a property of an entity.
- * @author
+ *  
  */
 public class EntityPropertyInfo {
   private String name;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
index c166c0e..6aa8fde 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/aggregator/EntityTypeMapping.java
@@ -28,7 +28,7 @@ import java.util.Set;
 import org.apache.olingo.odata2.api.ep.EntityProviderException;
 
 /**
- * @author
+ *  
  */
 public class EntityTypeMapping {
   private static final EntityTypeMapping ENTITY_TYPE_MAPPING = new EntityTypeMapping();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
index be579ee..cdfce38 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntityConsumer.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
 import org.apache.olingo.odata2.core.ep.aggregator.EntityInfoAggregator;
 
 /**
- * @author
+ *  
  */
 public class JsonEntityConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
index 3e79789..f81e589 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumer.java
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatJson;
 import org.apache.olingo.odata2.core.uri.ExpandSelectTreeNodeImpl;
 
 /**
- * @author
+ *  
  */
 public class JsonEntryConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
index 51a6e72..4cba012 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumer.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.core.ep.feed.ODataFeedImpl;
 import org.apache.olingo.odata2.core.ep.util.FormatJson;
 
 /**
- * @author
+ *  
  */
 public class JsonFeedConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
index 7e1c1aa..6d98cd6 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumer.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.core.ep.feed.FeedMetadataImpl;
 import org.apache.olingo.odata2.core.ep.util.FormatJson;
 
 /**
- * @author
+ *  
  */
 public class JsonLinkConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
index 5dd5d03..37c0b68 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumer.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.core.ep.aggregator.EntityPropertyInfo;
 import org.apache.olingo.odata2.core.ep.util.FormatJson;
 
 /**
- * @author
+ *  
  */
 public class JsonPropertyConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
index ffd260c..8a7255c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/JsonServiceDocumentConsumer.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.core.servicedocument.ServiceDocumentImpl;
 
 /**
  * Reads the OData service document (JSON).
- * @author
+ *  
  */
 public class JsonServiceDocumentConsumer {
   private static final String DEFAULT_CHARSET = "UTF-8";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
index 3b25363..678a95f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumer.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.core.ep.aggregator.EntityInfoAggregator;
 /**
  * Xml entity (content type dependent) consumer for reading input (from <code>content</code>).
  * 
- * @author
+ *  
  */
 public class XmlEntityConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
index 07f54e2..a71b4f5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntryConsumer.java
@@ -62,7 +62,7 @@ import org.apache.olingo.odata2.core.uri.ExpandSelectTreeNodeImpl;
  * 
  * {@link XmlEntryConsumer} instance can be reused for several {@link #readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)} calls
  * but be aware that the instance and their <code>readEntry*</code> methods are <b>NOT THREAD SAFE</b>.
- * @author
+ *  
  */
 public class XmlEntryConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
index e890880..e6b5e75 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlFeedConsumer.java
@@ -43,7 +43,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
  * {@link XmlFeedConsumer} instance use {@link XmlEntryConsumer#readEntry(XMLStreamReader, EntityInfoAggregator, EntityProviderReadProperties)} 
  * for read/consume of several entries.
  * 
- * @author
+ *  
  */
 public class XmlFeedConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
index 0ecfd83..72c69ef 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumer.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderException;
 import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
- * @author
+ *  
  */
 public class XmlLinkConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
index 68ff62f..d604033 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumer.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.core.ep.aggregator.EntityTypeMapping;
 import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
- * @author
+ *  
  */
 public class XmlPropertyConsumer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
index 45745dc..b1cb159 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/EntryMetadataImpl.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import org.apache.olingo.odata2.api.ep.entry.EntryMetadata;
 
 /**
- * @author
+ *  
  */
 public class EntryMetadataImpl implements EntryMetadata {
   private String id;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
index c6bb1e8..851daf0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/MediaMetadataImpl.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.core.ep.entry;
 import org.apache.olingo.odata2.api.ep.entry.MediaMetadata;
 
 /**
- * @author
+ *  
  */
 public class MediaMetadataImpl implements MediaMetadata {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
index 20283b0..73e2b27 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/entry/ODataEntryImpl.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
 import org.apache.olingo.odata2.core.uri.ExpandSelectTreeNodeImpl;
 
 /**
- * @author
+ *  
  */
 public class ODataEntryImpl implements ODataEntry {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
index 3a4ea79..38b5132 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryEntityProducer.java
@@ -62,7 +62,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
  * Serializes an ATOM entry.
- * @author
+ *  
  */
 public class AtomEntryEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
index a5bacc8..4e37197 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducer.java
@@ -42,7 +42,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
  * Serializes an ATOM feed.
- * @author
+ *  
  */
 public class AtomFeedProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
index 6682064..5291efb 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/AtomServiceDocumentProducer.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
  * Writes the  OData service document in XML.
- * @author
+ *  
  */
 public class AtomServiceDocumentProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
index 2bce069..4a4d3f8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonCollectionEntityProducer.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
  * Provider for writing a collection of simple-type or complex-type instances in JSON.
- * @author
+ *  
  */
 public class JsonCollectionEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
index b8140b0..8ee51f7 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducer.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 /**
  * Producer for writing an entity in JSON, also usable for function imports
  * returning a single instance of an entity type.
- * @author
+ *  
  */
 public class JsonEntryEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
index c8632ab..7967412 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorDocumentProducer.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatJson;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public class JsonErrorDocumentProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
index 9f1c31a..f9de3a3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducer.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
  * Producer for writing an entity collection (a feed) in JSON.
- * @author
+ *  
  */
 public class JsonFeedEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
index 902bc5f..a2de22c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducer.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
  * Producer for writing a link in JSON.
- * @author
+ *  
  */
 public class JsonLinkEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
index a7818b4..8b66fda 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducer.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
  * Producer for writing a link collection in JSON.
- * @author
+ *  
  */
 public class JsonLinksEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
index ad55fbe..8ea01c9 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyEntityProducer.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 /**
  * Producer for writing a single simple or complex property in JSON, also usable
  * for function imports returning a single instance of a simple or complex type.
- * @author
+ *  
  */
 public class JsonPropertyEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
index e2761fa..a58c9d8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducer.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
  * Writes the  OData service document in JSON.
- * @author
+ *  
  */
 public class JsonServiceDocumentProducer {
 


[20/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
index 69b94de..8d4d69e 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelService.java
@@ -70,8 +70,7 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
 
       } catch (JAXBException e) {
         mappingModelExists = false;
-        ODataJPAModelException.throwException(
-            ODataJPAModelException.GENERAL, e);
+        ODataJPAModelException.throwException(ODataJPAModelException.GENERAL, e);
       }
     }
   }
@@ -89,8 +88,7 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   @Override
   public String mapJPAPersistenceUnit(final String persistenceUnitName) {
 
-    JPAPersistenceUnitMapType persistenceUnit = mappingModel
-        .getPersistenceUnit();
+    JPAPersistenceUnitMapType persistenceUnit = mappingModel.getPersistenceUnit();
     if (persistenceUnit.getName().equals(persistenceUnitName)) {
       return persistenceUnit.getEDMSchemaNamespace();
     }
@@ -120,16 +118,13 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   }
 
   @Override
-  public String mapJPAAttribute(final String jpaEntityTypeName,
-      final String jpaAttributeName) {
+  public String mapJPAAttribute(final String jpaEntityTypeName, final String jpaAttributeName) {
     JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
-    if (jpaEntityTypeMap != null
-        && jpaEntityTypeMap.getJPAAttributes() != null) {
+    if (jpaEntityTypeMap != null && jpaEntityTypeMap.getJPAAttributes() != null) {
       // fixing attributes
       // removal issue
       // from mapping
-      for (JPAAttribute jpaAttribute : jpaEntityTypeMap
-          .getJPAAttributes().getJPAAttribute()) {
+      for (JPAAttribute jpaAttribute : jpaEntityTypeMap.getJPAAttributes().getJPAAttribute()) {
         if (jpaAttribute.getName().equals(jpaAttributeName)) {
           return jpaAttribute.getValue();
         }
@@ -140,12 +135,10 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   }
 
   @Override
-  public String mapJPARelationship(final String jpaEntityTypeName,
-      final String jpaRelationshipName) {
+  public String mapJPARelationship(final String jpaEntityTypeName, final String jpaRelationshipName) {
     JPAEntityTypeMapType jpaEntityTypeMap = searchJPAEntityTypeMapType(jpaEntityTypeName);
     if (jpaEntityTypeMap != null) {
-      for (JPARelationship jpaRealtionship : jpaEntityTypeMap
-          .getJPARelationships().getJPARelationship()) {
+      for (JPARelationship jpaRealtionship : jpaEntityTypeMap.getJPARelationships().getJPARelationship()) {
         if (jpaRealtionship.getName().equals(jpaRelationshipName)) {
           return jpaRealtionship.getValue();
         }
@@ -166,12 +159,10 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   }
 
   @Override
-  public String mapJPAEmbeddableTypeAttribute(final String jpaEmbeddableTypeName,
-      final String jpaAttributeName) {
+  public String mapJPAEmbeddableTypeAttribute(final String jpaEmbeddableTypeName, final String jpaAttributeName) {
     JPAEmbeddableTypeMapType jpaEmbeddableType = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
     if (jpaEmbeddableType != null && jpaEmbeddableType.getJPAAttributes() != null) {
-      for (JPAAttribute jpaAttribute : jpaEmbeddableType
-          .getJPAAttributes().getJPAAttribute()) {
+      for (JPAAttribute jpaAttribute : jpaEmbeddableType.getJPAAttributes().getJPAAttribute()) {
         if (jpaAttribute.getName().equals(jpaAttributeName)) {
           return jpaAttribute.getValue();
         }
@@ -180,10 +171,8 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
     return null;
   }
 
-  private JPAEntityTypeMapType searchJPAEntityTypeMapType(
-      final String jpaEntityTypeName) {
-    for (JPAEntityTypeMapType jpaEntityType : mappingModel
-        .getPersistenceUnit().getJPAEntityTypes().getJPAEntityType()) {
+  private JPAEntityTypeMapType searchJPAEntityTypeMapType(final String jpaEntityTypeName) {
+    for (JPAEntityTypeMapType jpaEntityType : mappingModel.getPersistenceUnit().getJPAEntityTypes().getJPAEntityType()) {
       if (jpaEntityType.getName().equals(jpaEntityTypeName)) {
         return jpaEntityType;
       }
@@ -192,11 +181,8 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
     return null;
   }
 
-  private JPAEmbeddableTypeMapType searchJPAEmbeddableTypeMapType(
-      final String jpaEmbeddableTypeName) {
-    for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel
-        .getPersistenceUnit().getJPAEmbeddableTypes()
-        .getJPAEmbeddableType()) {
+  private JPAEmbeddableTypeMapType searchJPAEmbeddableTypeMapType(final String jpaEmbeddableTypeName) {
+    for (JPAEmbeddableTypeMapType jpaEmbeddableType : mappingModel.getPersistenceUnit().getJPAEmbeddableTypes().getJPAEmbeddableType()) {
       if (jpaEmbeddableType.getName().equals(jpaEmbeddableTypeName)) {
         return jpaEmbeddableType;
       }
@@ -206,8 +192,7 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   }
 
   protected InputStream loadMappingModelInputStream() {
-    InputStream is = JPAEdmMappingModelService.class.getClassLoader()
-        .getResourceAsStream("../../" + mappingModelName);
+    InputStream is = JPAEdmMappingModelService.class.getClassLoader().getResourceAsStream("../../" + mappingModelName);
 
     return is;
 
@@ -223,12 +208,10 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   }
 
   @Override
-  public boolean checkExclusionOfJPAAttributeType(final String jpaEntityTypeName,
-      final String jpaAttributeName) {
+  public boolean checkExclusionOfJPAAttributeType(final String jpaEntityTypeName, final String jpaAttributeName) {
     JPAEntityTypeMapType type = searchJPAEntityTypeMapType(jpaEntityTypeName);
     if (type != null && type.getJPAAttributes() != null) {
-      for (JPAAttribute jpaAttribute : type.getJPAAttributes()
-          .getJPAAttribute()) {
+      for (JPAAttribute jpaAttribute : type.getJPAAttributes().getJPAAttribute()) {
         if (jpaAttribute.getName().equals(jpaAttributeName)) {
           return jpaAttribute.isExclude();
         }
@@ -238,8 +221,7 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   }
 
   @Override
-  public boolean checkExclusionOfJPAEmbeddableType(
-      final String jpaEmbeddableTypeName) {
+  public boolean checkExclusionOfJPAEmbeddableType(final String jpaEmbeddableTypeName) {
     JPAEmbeddableTypeMapType type = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
     if (type != null) {
       return type.isExclude();
@@ -248,12 +230,10 @@ public class JPAEdmMappingModelService implements JPAEdmMappingModelAccess {
   }
 
   @Override
-  public boolean checkExclusionOfJPAEmbeddableAttributeType(
-      final String jpaEmbeddableTypeName, final String jpaAttributeName) {
+  public boolean checkExclusionOfJPAEmbeddableAttributeType(final String jpaEmbeddableTypeName, final String jpaAttributeName) {
     JPAEmbeddableTypeMapType type = searchJPAEmbeddableTypeMapType(jpaEmbeddableTypeName);
     if (type != null && type.getJPAAttributes() != null) {
-      for (JPAAttribute jpaAttribute : type.getJPAAttributes()
-          .getJPAAttribute()) {
+      for (JPAAttribute jpaAttribute : type.getJPAAttributes().getJPAAttribute()) {
         if (jpaAttribute.getName().equals(jpaAttributeName)) {
           return jpaAttribute.isExclude();
         }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
index 271455d..dd1eea3 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilder.java
@@ -58,8 +58,7 @@ public class JPAEdmNameBuilder {
   private static final String UNDERSCORE = "_";
 
   public static FullQualifiedName build(final JPAEdmBaseView view, final String name) {
-    FullQualifiedName fqName = new FullQualifiedName(buildNamespace(view),
-        name);
+    FullQualifiedName fqName = new FullQualifiedName(buildNamespace(view), name);
     return fqName;
   }
 
@@ -77,13 +76,10 @@ public class JPAEdmNameBuilder {
 
     EntityType edmEntityType = view.getEdmEntityType();
     String jpaEntityName = view.getJPAEntityType().getName();
-    JPAEdmMappingModelAccess mappingModelAccess = view
-        .getJPAEdmMappingModelAccess();
+    JPAEdmMappingModelAccess mappingModelAccess = view.getJPAEdmMappingModelAccess();
     String edmEntityTypeName = null;
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
-      edmEntityTypeName = mappingModelAccess
-          .mapJPAEntityType(jpaEntityName);
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
+      edmEntityTypeName = mappingModelAccess.mapJPAEntityType(jpaEntityName);
     }
 
     JPAEdmMapping mapping = new JPAEdmMappingImpl();
@@ -93,8 +89,7 @@ public class JPAEdmNameBuilder {
       edmEntityTypeName = jpaEntityName;
     }
     //Setting the mapping object
-    edmEntityType.setMapping(((Mapping) mapping)
-        .setInternalName(jpaEntityName));
+    edmEntityType.setMapping(((Mapping) mapping).setInternalName(jpaEntityName));
 
     edmEntityType.setName(edmEntityTypeName);
 
@@ -109,8 +104,7 @@ public class JPAEdmNameBuilder {
    * EDM Schema Name - RULES
    * ************************************************************************
    */
-  public static void build(final JPAEdmSchemaView view)
-      throws ODataJPAModelException {
+  public static void build(final JPAEdmSchemaView view) throws ODataJPAModelException {
     view.getEdmSchema().setNamespace(buildNamespace(view));
   }
 
@@ -132,25 +126,16 @@ public class JPAEdmNameBuilder {
     String jpaAttributeName = jpaAttribute.getName();
     String propertyName = null;
 
-    JPAEdmMappingModelAccess mappingModelAccess = view
-        .getJPAEdmMappingModelAccess();
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
+    JPAEdmMappingModelAccess mappingModelAccess = view.getJPAEdmMappingModelAccess();
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
       if (isComplexMode) {
-        propertyName = mappingModelAccess
-            .mapJPAEmbeddableTypeAttribute(view
-                .getJPAEdmComplexTypeView()
-                .getJPAEmbeddableType().getJavaType()
-                .getSimpleName(), jpaAttributeName);
+        propertyName = mappingModelAccess.mapJPAEmbeddableTypeAttribute(view.getJPAEdmComplexTypeView().getJPAEmbeddableType().getJavaType().getSimpleName(), jpaAttributeName);
       } else {
-        propertyName = mappingModelAccess.mapJPAAttribute(
-            view.getJPAEdmEntityTypeView().getJPAEntityType()
-                .getName(), jpaAttributeName);
+        propertyName = mappingModelAccess.mapJPAAttribute(view.getJPAEdmEntityTypeView().getJPAEntityType().getName(), jpaAttributeName);
       }
     }
     if (propertyName == null) {
-      propertyName = Character.toUpperCase(jpaAttributeName.charAt(0))
-          + jpaAttributeName.substring(1);
+      propertyName = Character.toUpperCase(jpaAttributeName.charAt(0)) + jpaAttributeName.substring(1);
     }
 
     view.getEdmSimpleProperty().setName(propertyName);
@@ -158,8 +143,7 @@ public class JPAEdmNameBuilder {
     JPAEdmMapping mapping = new JPAEdmMappingImpl();
     ((Mapping) mapping).setInternalName(jpaAttributeName);
 
-    AnnotatedElement annotatedElement = (AnnotatedElement) jpaAttribute
-        .getJavaMember();
+    AnnotatedElement annotatedElement = (AnnotatedElement) jpaAttribute.getJavaMember();
     if (annotatedElement != null) {
       Column column = annotatedElement.getAnnotation(Column.class);
       if (column != null) {
@@ -196,8 +180,7 @@ public class JPAEdmNameBuilder {
    * ************************************************************************
    */
   public static void build(final JPAEdmEntityContainerView view) {
-    view.getEdmEntityContainer().setName(
-        buildNamespace(view) + ENTITY_CONTAINER_SUFFIX);
+    view.getEdmEntityContainer().setName(buildNamespace(view) + ENTITY_CONTAINER_SUFFIX);
   }
 
   /*
@@ -209,18 +192,14 @@ public class JPAEdmNameBuilder {
    * EDM EntitySet Name - RULES
    * ************************************************************************
    */
-  public static void build(final JPAEdmEntitySetView view,
-      final JPAEdmEntityTypeView entityTypeView) {
+  public static void build(final JPAEdmEntitySetView view, final JPAEdmEntityTypeView entityTypeView) {
     FullQualifiedName fQname = view.getEdmEntitySet().getEntityType();
-    JPAEdmMappingModelAccess mappingModelAccess = view
-        .getJPAEdmMappingModelAccess();
+    JPAEdmMappingModelAccess mappingModelAccess = view.getJPAEdmMappingModelAccess();
     String entitySetName = null;
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
       Mapping mapping = entityTypeView.getEdmEntityType().getMapping();
       if (mapping != null) {
-        entitySetName = mappingModelAccess.mapJPAEntitySet(mapping
-            .getInternalName());
+        entitySetName = mappingModelAccess.mapJPAEntitySet(mapping.getInternalName());
       }
     }
 
@@ -242,15 +221,11 @@ public class JPAEdmNameBuilder {
    */
   public static void build(final JPAEdmComplexType view) {
 
-    JPAEdmMappingModelAccess mappingModelAccess = view
-        .getJPAEdmMappingModelAccess();
-    String jpaEmbeddableTypeName = view.getJPAEmbeddableType()
-        .getJavaType().getSimpleName();
+    JPAEdmMappingModelAccess mappingModelAccess = view.getJPAEdmMappingModelAccess();
+    String jpaEmbeddableTypeName = view.getJPAEmbeddableType().getJavaType().getSimpleName();
     String edmComplexTypeName = null;
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
-      edmComplexTypeName = mappingModelAccess
-          .mapJPAEmbeddableType(jpaEmbeddableTypeName);
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
+      edmComplexTypeName = mappingModelAccess.mapJPAEmbeddableType(jpaEmbeddableTypeName);
     }
 
     if (edmComplexTypeName == null) {
@@ -273,28 +248,22 @@ public class JPAEdmNameBuilder {
    * EDM Complex Property Name - RULES
    * ************************************************************************
    */
-  public static void build(final JPAEdmComplexPropertyView complexView,
-      final JPAEdmPropertyView propertyView) {
+  public static void build(final JPAEdmComplexPropertyView complexView, final JPAEdmPropertyView propertyView) {
 
     ComplexProperty complexProperty = complexView.getEdmComplexProperty();
 
     String jpaAttributeName = propertyView.getJPAAttribute().getName();
-    String jpaEntityTypeName = propertyView.getJPAEdmEntityTypeView()
-        .getJPAEntityType().getName();
+    String jpaEntityTypeName = propertyView.getJPAEdmEntityTypeView().getJPAEntityType().getName();
 
-    JPAEdmMappingModelAccess mappingModelAccess = complexView
-        .getJPAEdmMappingModelAccess();
+    JPAEdmMappingModelAccess mappingModelAccess = complexView.getJPAEdmMappingModelAccess();
     String propertyName = null;
 
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
-      propertyName = mappingModelAccess.mapJPAAttribute(
-          jpaEntityTypeName, jpaAttributeName);
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
+      propertyName = mappingModelAccess.mapJPAAttribute(jpaEntityTypeName, jpaAttributeName);
     }
 
     if (propertyName == null) {
-      propertyName = Character.toUpperCase(jpaAttributeName.charAt(0))
-          + jpaAttributeName.substring(1);
+      propertyName = Character.toUpperCase(jpaAttributeName.charAt(0)) + jpaAttributeName.substring(1);
     }
     // change for navigation property issue
     JPAEdmMapping mapping = new JPAEdmMappingImpl();
@@ -306,22 +275,18 @@ public class JPAEdmNameBuilder {
 
   }
 
-  public static void build(final JPAEdmComplexPropertyView complexView, final String parentComplexTypeName)
-  {
+  public static void build(final JPAEdmComplexPropertyView complexView, final String parentComplexTypeName) {
     ComplexProperty complexProperty = complexView.getEdmComplexProperty();
 
     JPAEdmMappingModelAccess mappingModelAccess = complexView.getJPAEdmMappingModelAccess();
     JPAEdmPropertyView propertyView = ((JPAEdmPropertyView) complexView);
     String jpaAttributeName = propertyView.getJPAAttribute().getName();
     String propertyName = null;
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
-      propertyName = mappingModelAccess.mapJPAEmbeddableTypeAttribute(
-          parentComplexTypeName, jpaAttributeName);
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
+      propertyName = mappingModelAccess.mapJPAEmbeddableTypeAttribute(parentComplexTypeName, jpaAttributeName);
     }
     if (propertyName == null) {
-      propertyName = Character.toUpperCase(jpaAttributeName.charAt(0))
-          + jpaAttributeName.substring(1);
+      propertyName = Character.toUpperCase(jpaAttributeName.charAt(0)) + jpaAttributeName.substring(1);
     }
     JPAEdmMapping mapping = new JPAEdmMappingImpl();
     ((Mapping) mapping).setInternalName(jpaAttributeName);
@@ -340,8 +305,7 @@ public class JPAEdmNameBuilder {
    * EDM Association End Name - RULES
    * ************************************************************************
    */
-  public static void build(final JPAEdmAssociationEndView assocaitionEndView,
-      final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
+  public static void build(final JPAEdmAssociationEndView assocaitionEndView, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
 
     String namespace = buildNamespace(assocaitionEndView);
 
@@ -353,22 +317,17 @@ public class JPAEdmNameBuilder {
     String jpaEntityTypeName = null;
     try {
 
-      PluralAttribute<?, ?, ?> jpattr = (PluralAttribute<?, ?, ?>) propertyView
-          .getJPAAttribute();
+      PluralAttribute<?, ?, ?> jpattr = (PluralAttribute<?, ?, ?>) propertyView.getJPAAttribute();
 
-      jpaEntityTypeName = jpattr.getElementType().getJavaType()
-          .getSimpleName();
+      jpaEntityTypeName = jpattr.getElementType().getJavaType().getSimpleName();
 
     } catch (Exception e) {
-      jpaEntityTypeName = propertyView.getJPAAttribute().getJavaType()
-          .getSimpleName();
+      jpaEntityTypeName = propertyView.getJPAAttribute().getJavaType().getSimpleName();
     }
 
-    JPAEdmMappingModelAccess mappingModelAccess = assocaitionEndView
-        .getJPAEdmMappingModelAccess();
+    JPAEdmMappingModelAccess mappingModelAccess = assocaitionEndView.getJPAEdmMappingModelAccess();
 
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
       name = mappingModelAccess.mapJPAEntityType(jpaEntityTypeName);
     }
 
@@ -382,13 +341,10 @@ public class JPAEdmNameBuilder {
   }
 
   private static String buildNamespace(final JPAEdmBaseView view) {
-    JPAEdmMappingModelAccess mappingModelAccess = view
-        .getJPAEdmMappingModelAccess();
+    JPAEdmMappingModelAccess mappingModelAccess = view.getJPAEdmMappingModelAccess();
     String namespace = null;
-    if (mappingModelAccess != null
-        && mappingModelAccess.isMappingModelExists()) {
-      namespace = mappingModelAccess.mapJPAPersistenceUnit(view
-          .getpUnitName());
+    if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
+      namespace = mappingModelAccess.mapJPAPersistenceUnit(view.getpUnitName());
     }
     if (namespace == null) {
       namespace = view.getpUnitName();
@@ -442,9 +398,7 @@ public class JPAEdmNameBuilder {
 
   }
 
-  public static void build(final JPAEdmAssociationView associationView,
-      final JPAEdmPropertyView propertyView,
-      final JPAEdmNavigationPropertyView navPropertyView, final int count) {
+  public static void build(final JPAEdmAssociationView associationView, final JPAEdmPropertyView propertyView, final JPAEdmNavigationPropertyView navPropertyView, final int count) {
 
     String toName = null;
     String fromName = null;
@@ -453,34 +407,24 @@ public class JPAEdmNameBuilder {
     String namespace = buildNamespace(associationView);
 
     Association association = associationView.getEdmAssociation();
-    navProp.setRelationship(new FullQualifiedName(namespace, association
-        .getName()));
+    navProp.setRelationship(new FullQualifiedName(namespace, association.getName()));
 
-    FullQualifiedName associationEndTypeOne = association.getEnd1()
-        .getType();
-    FullQualifiedName associationEndTypeTwo = association.getEnd2()
-        .getType();
+    FullQualifiedName associationEndTypeOne = association.getEnd1().getType();
+    FullQualifiedName associationEndTypeTwo = association.getEnd2().getType();
 
     Attribute<?, ?> jpaAttribute = propertyView.getJPAAttribute();
     navProp.setMapping(new Mapping().setInternalName(jpaAttribute.getName()));
 
-    String jpaEntityTypeName = propertyView.getJPAEdmEntityTypeView()
-        .getJPAEntityType().getName();
-    JPAEdmMappingModelAccess mappingModelAccess = navPropertyView
-        .getJPAEdmMappingModelAccess();
+    String jpaEntityTypeName = propertyView.getJPAEdmEntityTypeView().getJPAEntityType().getName();
+    JPAEdmMappingModelAccess mappingModelAccess = navPropertyView.getJPAEdmMappingModelAccess();
 
     try {
-      PluralAttribute<?, ?, ?> jpattr = (PluralAttribute<?, ?, ?>) propertyView
-          .getJPAAttribute();
-
-      if (mappingModelAccess != null
-          && mappingModelAccess.isMappingModelExists()) {
-        toName = mappingModelAccess.mapJPAEntityType(jpattr
-            .getElementType().getJavaType().getSimpleName());
-        fromName = mappingModelAccess
-            .mapJPAEntityType(jpaEntityTypeName);
-        navPropName = mappingModelAccess.mapJPARelationship(
-            jpaEntityTypeName, jpattr.getName());
+      PluralAttribute<?, ?, ?> jpattr = (PluralAttribute<?, ?, ?>) propertyView.getJPAAttribute();
+
+      if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
+        toName = mappingModelAccess.mapJPAEntityType(jpattr.getElementType().getJavaType().getSimpleName());
+        fromName = mappingModelAccess.mapJPAEntityType(jpaEntityTypeName);
+        navPropName = mappingModelAccess.mapJPARelationship(jpaEntityTypeName, jpattr.getName());
       }
       if (toName == null) {
         toName = jpattr.getElementType().getJavaType().getSimpleName();
@@ -506,14 +450,10 @@ public class JPAEdmNameBuilder {
       }
 
     } catch (Exception e) {
-      if (mappingModelAccess != null
-          && mappingModelAccess.isMappingModelExists()) {
-        navPropName = mappingModelAccess.mapJPARelationship(
-            jpaEntityTypeName, jpaAttribute.getName());
-        toName = mappingModelAccess.mapJPAEntityType(jpaAttribute
-            .getJavaType().getSimpleName());
-        fromName = mappingModelAccess
-            .mapJPAEntityType(jpaEntityTypeName);
+      if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists()) {
+        navPropName = mappingModelAccess.mapJPARelationship(jpaEntityTypeName, jpaAttribute.getName());
+        toName = mappingModelAccess.mapJPAEntityType(jpaAttribute.getJavaType().getSimpleName());
+        fromName = mappingModelAccess.mapJPAEntityType(jpaEntityTypeName);
       }
       if (toName == null) {
         toName = jpaAttribute.getJavaType().getSimpleName();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
index 931da2b..879d919 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
@@ -55,38 +55,27 @@ public class JPATypeConvertor {
   public static EdmSimpleTypeKind convertToEdmSimpleType(final Class<?> jpaType, final Attribute<?, ?> currentAttribute) throws ODataJPAModelException {
     if (jpaType.equals(String.class)) {
       return EdmSimpleTypeKind.String;
-    }
-    else if (jpaType.equals(Long.class) || jpaType.equals(long.class)) {
+    } else if (jpaType.equals(Long.class) || jpaType.equals(long.class)) {
       return EdmSimpleTypeKind.Int64;
-    }
-    else if (jpaType.equals(Short.class) || jpaType.equals(short.class)) {
+    } else if (jpaType.equals(Short.class) || jpaType.equals(short.class)) {
       return EdmSimpleTypeKind.Int16;
-    }
-    else if (jpaType.equals(Integer.class) || jpaType.equals(int.class)) {
+    } else if (jpaType.equals(Integer.class) || jpaType.equals(int.class)) {
       return EdmSimpleTypeKind.Int32;
-    }
-    else if (jpaType.equals(Double.class) || jpaType.equals(double.class)) {
+    } else if (jpaType.equals(Double.class) || jpaType.equals(double.class)) {
       return EdmSimpleTypeKind.Double;
-    }
-    else if (jpaType.equals(Float.class) || jpaType.equals(float.class)) {
+    } else if (jpaType.equals(Float.class) || jpaType.equals(float.class)) {
       return EdmSimpleTypeKind.Single;
-    }
-    else if (jpaType.equals(BigDecimal.class)) {
+    } else if (jpaType.equals(BigDecimal.class)) {
       return EdmSimpleTypeKind.Decimal;
-    }
-    else if (jpaType.equals(byte[].class)) {
+    } else if (jpaType.equals(byte[].class)) {
       return EdmSimpleTypeKind.Binary;
-    }
-    else if (jpaType.equals(Byte.class) || jpaType.equals(byte.class)) {
+    } else if (jpaType.equals(Byte.class) || jpaType.equals(byte.class)) {
       return EdmSimpleTypeKind.Byte;
-    }
-    else if (jpaType.equals(Byte[].class)) {
+    } else if (jpaType.equals(Byte[].class)) {
       return EdmSimpleTypeKind.Binary;
-    }
-    else if (jpaType.equals(Boolean.class) || jpaType.equals(boolean.class)) {
+    } else if (jpaType.equals(Boolean.class) || jpaType.equals(boolean.class)) {
       return EdmSimpleTypeKind.Boolean;
-    }
-    else if ((jpaType.equals(Date.class)) || (jpaType.equals(Calendar.class))) {
+    } else if ((jpaType.equals(Date.class)) || (jpaType.equals(Calendar.class))) {
       try {
         if ((currentAttribute != null) && (currentAttribute.getDeclaringType().getJavaType().getDeclaredField(currentAttribute.getName()).getAnnotation(Temporal.class).value() == TemporalType.TIME)) {
           return EdmSimpleTypeKind.Time;
@@ -94,14 +83,11 @@ public class JPATypeConvertor {
           return EdmSimpleTypeKind.DateTime;
         }
       } catch (NoSuchFieldException e) {
-        throw ODataJPAModelException
-            .throwException(ODataJPAModelException.GENERAL.addContent(e.getMessage()), e);
+        throw ODataJPAModelException.throwException(ODataJPAModelException.GENERAL.addContent(e.getMessage()), e);
       } catch (SecurityException e) {
-        throw ODataJPAModelException
-            .throwException(ODataJPAModelException.GENERAL.addContent(e.getMessage()), e);
+        throw ODataJPAModelException.throwException(ODataJPAModelException.GENERAL.addContent(e.getMessage()), e);
       }
-    }
-    else if (jpaType.equals(UUID.class)) {
+    } else if (jpaType.equals(UUID.class)) {
       return EdmSimpleTypeKind.Guid;
     }
     throw ODataJPAModelException.throwException(ODataJPAModelException.TYPE_NOT_SUPPORTED.addContent(jpaType.toString()), null);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequest.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequest.java
index 6297f67..25802fe 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequest.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequest.java
@@ -69,22 +69,17 @@ public class JPACreateRequest extends JPAWriteRequest {
     try {
       entityType = entitySet.getEntityType();
     } catch (EdmException e3) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e3.getMessage()), e3);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e3.getMessage()), e3);
     }
     String entityName = null;
     try {
-      if (entityType.getMapping() != null && entityType.getMapping().getInternalName() != null)
-      {
+      if (entityType.getMapping() != null && entityType.getMapping().getInternalName() != null) {
         entityName = entityType.getMapping().getInternalName();
       } else {
         entityName = entityType.getName();
       }
     } catch (EdmException e1) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e1.getMessage()), e1);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e1.getMessage()), e1);
     }
     Object jpaEntity = null;
     Set<EntityType<?>> entityTypeSet = metamodel.getEntities();
@@ -96,13 +91,9 @@ public class JPACreateRequest extends JPAWriteRequest {
           jpaEntity = entityTypeTemp.getJavaType().newInstance();
           break;
         } catch (InstantiationException e) {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.GENERAL
-                  .addContent(e.getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (IllegalAccessException e) {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.GENERAL
-                  .addContent(e.getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         }
       }
     }
@@ -111,9 +102,7 @@ public class JPACreateRequest extends JPAWriteRequest {
     try {
       entryValues = parseEntry(entitySet, content, requestContentType, true);
     } catch (ODataBadRequestException e1) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e1.getMessage()), e1);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e1.getMessage()), e1);
     }
 
     Map<String, Object> propertyValueMap = entryValues.getProperties();
@@ -123,9 +112,7 @@ public class JPACreateRequest extends JPAWriteRequest {
     try {
       navPropEntitySetMap = createInlinedEntities(jpaEntity, entitySet, entryValues, currentEntityName);
     } catch (ODataException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
     List<T> objectList = new ArrayList<T>();
     objectList.add((T) jpaEntity);
@@ -134,9 +121,7 @@ public class JPACreateRequest extends JPAWriteRequest {
   }
 
   @SuppressWarnings("unchecked")
-  public final Object parse2JPAEntityValueMap(
-      final Object jpaEntity, final EdmStructuralType edmEntityType, final Map<String, Object> propertyValueMap, final String entityName)
-      throws ODataJPARuntimeException {
+  public final Object parse2JPAEntityValueMap(final Object jpaEntity, final EdmStructuralType edmEntityType, final Map<String, Object> propertyValueMap, final String entityName) throws ODataJPARuntimeException {
 
     if (jpaEntity == null || edmEntityType == null || propertyValueMap == null || propertyValueMap.size() == 0) {
       return null;
@@ -145,20 +130,16 @@ public class JPACreateRequest extends JPAWriteRequest {
     String jpaEntityAccessKey = jpaEntity.getClass().getName();
 
     if (!jpaEntityAccessMap.containsKey(jpaEntityAccessKey)) {
-      jpaEntityAccessMap.put(jpaEntityAccessKey,
-          getSetters(jpaEntity, edmEntityType, true));
+      jpaEntityAccessMap.put(jpaEntityAccessKey, getSetters(jpaEntity, edmEntityType, true));
     }
 
-    HashMap<String, Method> setters = jpaEntityAccessMap
-        .get(jpaEntityAccessKey);
-    HashMap<String, String> embeddableKeys = jpaEmbeddableKeyMap
-        .get(jpaEntityAccessKey);
+    HashMap<String, Method> setters = jpaEntityAccessMap.get(jpaEntityAccessKey);
+    HashMap<String, String> embeddableKeys = jpaEmbeddableKeyMap.get(jpaEntityAccessKey);
     String propertyName = null;
     try {
       for (String key : setters.keySet()) {
 
-        EdmProperty property = (EdmProperty) edmEntityType
-            .getProperty(key);
+        EdmProperty property = (EdmProperty) edmEntityType.getProperty(key);
         if (property.getMapping() != null && property.getMapping().getInternalName() != null) {
           propertyName = property.getMapping().getInternalName();
         } else {
@@ -176,8 +157,7 @@ public class JPACreateRequest extends JPAWriteRequest {
         if (method != null) {
           if (property.getType().getKind().equals(EdmTypeKind.COMPLEX)) {
             Object complexObject = jpaComplexObjectMap.get(propertyName);
-            parse2JPAEntityValueMap(complexObject, ((EdmComplexType) property.getType()),
-                (Map<String, Object>) propertyValue, propertyName);
+            parse2JPAEntityValueMap(complexObject, ((EdmComplexType) property.getType()), (Map<String, Object>) propertyValue, propertyName);
             setters.get(key).invoke(jpaEntity, complexObject);
           } else {
             setters.get(key).invoke(jpaEntity, propertyValue);
@@ -195,57 +175,40 @@ public class JPACreateRequest extends JPAWriteRequest {
           Class<?> propertyClass = null;
 
           try {
-            for (EntityType<?> entity : metamodel.getEntities())
-            {
-              if (entity.getName().equals(entityName))
-              {
+            for (EntityType<?> entity : metamodel.getEntities()) {
+              if (entity.getName().equals(entityName)) {
                 Attribute<?, ?> attribute = entity.getAttribute(nameParts[0].substring(3, 4).toLowerCase() + nameParts[0].substring(4));
                 propertyClass = attribute.getJavaType();
                 if (embeddableKeyObj == null) {
                   try {
                     embeddableKeyObj = propertyClass.newInstance();
                   } catch (InstantiationException e) {
-                    throw ODataJPARuntimeException
-                        .throwException(ODataJPARuntimeException.GENERAL
-                            .addContent(e.getMessage()), e);
+                    throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
                   }
                 }
                 break;
               }
             }
 
-            method = propertyValue.getClass().getMethod(
-                nameParts[0], propertyClass);
+            method = propertyValue.getClass().getMethod(nameParts[0], propertyClass);
             populateEmbeddableKey(embeddableKeyObj, embeddableKey, nameParts[1], propertyValueMap);
           } catch (NoSuchMethodException e) {
-            throw ODataJPARuntimeException
-                .throwException(ODataJPARuntimeException.GENERAL
-                    .addContent(e.getMessage()), e);
+            throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
           }
         }
         propertyName = "Embeddable Key";//$NON-NLS-1$
         method.invoke(jpaEntity, embeddableKeyObj);
       }
     } catch (SecurityException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalAccessException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.ERROR_JPQL_PARAM_VALUE
-              .addContent(propertyName), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_PARAM_VALUE.addContent(propertyName), e);
     } catch (InvocationTargetException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
     return jpaEntity;
   }
@@ -256,28 +219,18 @@ public class JPACreateRequest extends JPAWriteRequest {
     try {
       method = embeddableKeyObject.getClass().getMethod(setterName, propertyClass);
     } catch (NoSuchMethodException e1) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e1.getMessage()), e1);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e1.getMessage()), e1);
     } catch (SecurityException e1) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e1.getMessage()), e1);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e1.getMessage()), e1);
     }
     try {
       method.invoke(embeddableKeyObject, propertyValueMap.get(key));
     } catch (IllegalAccessException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.ERROR_JPQL_KEY_VALUE
-              .addContent(key), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_KEY_VALUE.addContent(key), e);
     } catch (InvocationTargetException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
   }
 
@@ -305,16 +258,13 @@ public class JPACreateRequest extends JPAWriteRequest {
           String entityName = null;
           EdmEntityType relatedEntityType = relatedEntitySet.getEntityType();
           try {
-            if (relatedEntityType.getMapping() != null && relatedEntityType.getMapping().getInternalName() != null)
-            {
+            if (relatedEntityType.getMapping() != null && relatedEntityType.getMapping().getInternalName() != null) {
               entityName = relatedEntityType.getMapping().getInternalName();
             } else {
               entityName = relatedEntityType.getName();
             }
           } catch (EdmException e1) {
-            throw ODataJPARuntimeException
-                .throwException(ODataJPARuntimeException.GENERAL
-                    .addContent(e1.getMessage()), e1);
+            throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e1.getMessage()), e1);
           }
 
           Object relatedData = null;
@@ -328,13 +278,9 @@ public class JPACreateRequest extends JPAWriteRequest {
                 relatedData = entityTypeTemp.getJavaType().newInstance();
                 break;
               } catch (InstantiationException e) {
-                throw ODataJPARuntimeException
-                    .throwException(ODataJPARuntimeException.GENERAL
-                        .addContent(e.getMessage()), e);
+                throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
               } catch (IllegalAccessException e) {
-                throw ODataJPARuntimeException
-                    .throwException(ODataJPARuntimeException.GENERAL
-                        .addContent(e.getMessage()), e);
+                throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
               }
             }
           }
@@ -357,8 +303,7 @@ public class JPACreateRequest extends JPAWriteRequest {
   }
 
   @SuppressWarnings("unchecked")
-  private void setNavigationProperties(
-      final Object jpaEntity, final EdmEntitySet entitySet, final Map<String, Object> propertyValueMap, final String entityName, final Map<String, Class<?>> relatedClassMap) throws ODataJPARuntimeException {
+  private void setNavigationProperties(final Object jpaEntity, final EdmEntitySet entitySet, final Map<String, Object> propertyValueMap, final String entityName, final Map<String, Class<?>> relatedClassMap) throws ODataJPARuntimeException {
     if (jpaEntity == null || entitySet == null || propertyValueMap == null || propertyValueMap.size() == 0) {
       return;
     }
@@ -378,17 +323,11 @@ public class JPACreateRequest extends JPAWriteRequest {
           method.invoke(jpaEntity, propertyValue.get(0));
         }
       } catch (IllegalAccessException e) {
-        throw ODataJPARuntimeException
-            .throwException(ODataJPARuntimeException.GENERAL
-                .addContent(e.getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (IllegalArgumentException e) {
-        throw ODataJPARuntimeException
-            .throwException(ODataJPARuntimeException.GENERAL
-                .addContent(e.getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (InvocationTargetException e) {
-        throw ODataJPARuntimeException
-            .throwException(ODataJPARuntimeException.GENERAL
-                .addContent(e.getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
     }
 
@@ -402,9 +341,7 @@ public class JPACreateRequest extends JPAWriteRequest {
     try {
       edmEntityType = edmEntitySet.getEntityType();
     } catch (EdmException e2) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e2.getMessage()), e2);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e2.getMessage()), e2);
     }
 
     try {
@@ -412,16 +349,13 @@ public class JPACreateRequest extends JPAWriteRequest {
         final EdmNavigationProperty navigationProperty = (EdmNavigationProperty) edmEntityType.getProperty(navigationPropertyName);
         String entityName = null;
         try {
-          if (navigationProperty.getMapping() != null && navigationProperty.getMapping().getInternalName() != null)
-          {
+          if (navigationProperty.getMapping() != null && navigationProperty.getMapping().getInternalName() != null) {
             entityName = navigationProperty.getMapping().getInternalName();
           } else {
             entityName = navigationProperty.getName();
           }
         } catch (EdmException e1) {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.GENERAL
-                  .addContent(e1.getMessage()), e1);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e1.getMessage()), e1);
         }
         String name = getSetterName(entityName);
 
@@ -437,31 +371,22 @@ public class JPACreateRequest extends JPAWriteRequest {
           multiplicityMap.put(entityName, EdmMultiplicity.ONE);
         }
         try {
-          setters.put(
-              entityName,
-              jpaEntity.getClass().getDeclaredMethod(name, propertyClass));
+          setters.put(entityName, jpaEntity.getClass().getDeclaredMethod(name, propertyClass));
         } catch (NoSuchMethodException e) {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.GENERAL
-                  .addContent(e.getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (SecurityException e) {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.GENERAL
-                  .addContent(e.getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         }
       }
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
     mapList.add(0, setters);
     mapList.add(1, multiplicityMap);
     return mapList;
   }
 
-  private String getSetterName(final String navigationPropertyName)
-      throws ODataJPARuntimeException {
+  private String getSetterName(final String navigationPropertyName) throws ODataJPARuntimeException {
     StringBuilder builder = new StringBuilder();
     char c = Character.toUpperCase(navigationPropertyName.charAt(0));
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPALink.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPALink.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPALink.java
index c1a3e8c..91fa53a 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPALink.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPALink.java
@@ -52,8 +52,7 @@ public class JPALink {
 
   public JPALink(final ODataJPAContext context) {
     this.context = context;
-    jpaProcessor = ODataJPAFactory.createFactory().getJPAAccessFactory()
-        .getJPAProcessor(this.context);
+    jpaProcessor = ODataJPAFactory.createFactory().getJPAAccessFactory().getJPAProcessor(this.context);
     parser = new ODataEntityParser(this.context);
   }
 
@@ -61,8 +60,7 @@ public class JPALink {
     sourceJPAEntity = jpaEntity;
   }
 
-  public void create(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType)
-      throws ODataJPARuntimeException, ODataJPAModelException {
+  public void create(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
 
     EdmEntitySet targetEntitySet = uriInfo.getTargetEntitySet();
     String targerEntitySetName;
@@ -70,9 +68,7 @@ public class JPALink {
     try {
       targerEntitySetName = targetEntitySet.getName();
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     List<UriInfo> uriInfoList = new ArrayList<UriInfo>();
@@ -82,9 +78,7 @@ public class JPALink {
       uriInfoList = new ArrayList<UriInfo>();
       uriInfoList.add(getUriInfo);
       navigationProperty = uriInfo.getNavigationSegments().get(0).getNavigationProperty();
-    }
-    else
-    {
+    } else {
       uriInfoList = parser.parseLinks(targetEntitySet, content, contentType);
     }
 
@@ -94,10 +88,8 @@ public class JPALink {
     try {
       for (UriInfo getUriInfo : uriInfoList) {
 
-        if (!getUriInfo.getTargetEntitySet().getName().equals(targerEntitySetName))
-        {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.RELATIONSHIP_INVALID, null);
+        if (!getUriInfo.getTargetEntitySet().getName().equals(targerEntitySetName)) {
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RELATIONSHIP_INVALID, null);
         }
         if (!((UriInfo) uriInfo).isLinks()) {
           navigationProperty = getUriInfo.getNavigationSegments().get(0).getNavigationProperty();
@@ -108,18 +100,14 @@ public class JPALink {
           getUriInfo = parser.parseLinkURI();
           sourceJPAEntity = jpaProcessor.process((GetEntityUriInfo) getUriInfo);
           if (sourceJPAEntity == null) {
-            throw ODataJPARuntimeException
-                .throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND.
-                    addContent(getUriInfo.getTargetEntitySet().getName()), null);
+            throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND.addContent(getUriInfo.getTargetEntitySet().getName()), null);
           }
         }
 
         JPAEntityParser entityParser = JPAEntityParser.create();
-        Method setMethod = entityParser.getAccessModifier(sourceJPAEntity,
-            navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
+        Method setMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
 
-        Method getMethod = entityParser.getAccessModifier(sourceJPAEntity,
-            navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
+        Method getMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
 
         if (getMethod.getReturnType().getTypeParameters() != null) {
           @SuppressWarnings("unchecked")
@@ -131,21 +119,13 @@ public class JPALink {
         }
       }
     } catch (IllegalAccessException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (InvocationTargetException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
   }
 
@@ -163,8 +143,7 @@ public class JPALink {
 
   }
 
-  public void update(final PutMergePatchUriInfo putUriInfo, final InputStream content,
-      final String requestContentType, final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
+  public void update(final PutMergePatchUriInfo putUriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
     UriInfo uriInfo = (UriInfo) putUriInfo;
 
     EdmEntitySet targetEntitySet = uriInfo.getTargetEntitySet();
@@ -173,9 +152,7 @@ public class JPALink {
     try {
       targerEntitySetName = targetEntitySet.getName();
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     List<UriInfo> uriInfoList = new ArrayList<UriInfo>();
@@ -185,9 +162,7 @@ public class JPALink {
       uriInfoList = new ArrayList<UriInfo>();
       uriInfoList.add(getUriInfo);
       navigationProperty = uriInfo.getNavigationSegments().get(0).getNavigationProperty();
-    }
-    else
-    {
+    } else {
       uriInfoList = parser.parseLinks(targetEntitySet, content, contentType);
     }
 
@@ -197,10 +172,8 @@ public class JPALink {
     try {
       for (UriInfo getUriInfo : uriInfoList) {
 
-        if (!getUriInfo.getTargetEntitySet().getName().equals(targerEntitySetName))
-        {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.RELATIONSHIP_INVALID, null);
+        if (!getUriInfo.getTargetEntitySet().getName().equals(targerEntitySetName)) {
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RELATIONSHIP_INVALID, null);
         }
         if (!((UriInfo) uriInfo).isLinks()) {
           navigationProperty = getUriInfo.getNavigationSegments().get(0).getNavigationProperty();
@@ -211,18 +184,14 @@ public class JPALink {
           getUriInfo = parser.parseLinkURI();
           sourceJPAEntity = jpaProcessor.process((GetEntityUriInfo) getUriInfo);
           if (sourceJPAEntity == null) {
-            throw ODataJPARuntimeException
-                .throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND.
-                    addContent(getUriInfo.getTargetEntitySet().getName()), null);
+            throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.RESOURCE_X_NOT_FOUND.addContent(getUriInfo.getTargetEntitySet().getName()), null);
           }
         }
 
         JPAEntityParser entityParser = JPAEntityParser.create();
-        Method setMethod = entityParser.getAccessModifier(sourceJPAEntity,
-            navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
+        Method setMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_SET);
 
-        Method getMethod = entityParser.getAccessModifier(sourceJPAEntity,
-            navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
+        Method getMethod = entityParser.getAccessModifier(sourceJPAEntity, navigationProperty, JPAEntityParser.ACCESS_MODIFIER_GET);
 
         if (getMethod.getReturnType().getTypeParameters() != null && getMethod.getReturnType().getTypeParameters().length != 0) {
           @SuppressWarnings("unchecked")
@@ -234,21 +203,13 @@ public class JPALink {
         }
       }
     } catch (IllegalAccessException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (InvocationTargetException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequest.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequest.java
index b8ae487..5781a96 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequest.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequest.java
@@ -50,33 +50,25 @@ public class JPAUpdateRequest extends JPAWriteRequest {
     try {
       entityType = entitySet.getEntityType();
     } catch (EdmException e3) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e3.getMessage()), e3);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e3.getMessage()), e3);
     }
 
     ODataEntry entryValues = null;
     try {
       entryValues = parseEntry(entitySet, content, requestContentType, false);
     } catch (ODataBadRequestException e1) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e1.getMessage()), e1);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e1.getMessage()), e1);
     }
     try {
       Map<String, Object> propertValueMap = entryValues.getProperties();
       parse2JPAEntityValueMap(jpaEntity, entityType, propertValueMap);
     } catch (ODataJPARuntimeException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
   }
 
   @SuppressWarnings("unchecked")
-  public final Object parse2JPAEntityValueMap(
-      final Object jpaEntity, final EdmStructuralType edmEntityType, final Map<String, Object> propertyValueMap)
-      throws ODataJPARuntimeException {
+  public final Object parse2JPAEntityValueMap(final Object jpaEntity, final EdmStructuralType edmEntityType, final Map<String, Object> propertyValueMap) throws ODataJPARuntimeException {
 
     if (jpaEntity == null || edmEntityType == null || propertyValueMap == null) {
       return null;
@@ -85,20 +77,16 @@ public class JPAUpdateRequest extends JPAWriteRequest {
     String jpaEntityAccessKey = jpaEntity.getClass().getName();
 
     if (!jpaEntityAccessMap.containsKey(jpaEntityAccessKey)) {
-      jpaEntityAccessMap.put(jpaEntityAccessKey,
-          getSetters(jpaEntity, edmEntityType, false));
+      jpaEntityAccessMap.put(jpaEntityAccessKey, getSetters(jpaEntity, edmEntityType, false));
     }
 
-    HashMap<String, Method> setters = jpaEntityAccessMap
-        .get(jpaEntityAccessKey);
+    HashMap<String, Method> setters = jpaEntityAccessMap.get(jpaEntityAccessKey);
     List<EdmProperty> keyProperties = null;
     if (edmEntityType instanceof EdmEntityType) {
       try {
         keyProperties = ((EdmEntityType) edmEntityType).getKeyProperties();
       } catch (EdmException e) {
-        throw ODataJPARuntimeException
-            .throwException(ODataJPARuntimeException.GENERAL
-                .addContent(e.getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
     }
     boolean isKeyProperty = false;
@@ -117,8 +105,7 @@ public class JPAUpdateRequest extends JPAWriteRequest {
             continue;
           }
         }
-        EdmProperty property = (EdmProperty) edmEntityType
-            .getProperty(key);
+        EdmProperty property = (EdmProperty) edmEntityType.getProperty(key);
         if (property.getMapping() != null && property.getMapping().getInternalName() != null) {
           propertyName = property.getMapping().getInternalName();
         } else {
@@ -137,8 +124,7 @@ public class JPAUpdateRequest extends JPAWriteRequest {
           if (method != null) {
             if (property.getType().getKind().equals(EdmTypeKind.COMPLEX)) {
               Object complexObject = jpaComplexObjectMap.get(propertyName);
-              parse2JPAEntityValueMap(complexObject, ((EdmComplexType) property.getType()),
-                  (Map<String, Object>) propertyValue);
+              parse2JPAEntityValueMap(complexObject, ((EdmComplexType) property.getType()), (Map<String, Object>) propertyValue);
               setters.get(key).invoke(jpaEntity, complexObject);
             } else {
               setters.get(key).invoke(jpaEntity, propertyValue);
@@ -148,25 +134,15 @@ public class JPAUpdateRequest extends JPAWriteRequest {
 
       }
     } catch (SecurityException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalAccessException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.ERROR_JPQL_PARAM_VALUE
-              .addContent(propertyName), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_PARAM_VALUE.addContent(propertyName), e);
     } catch (InvocationTargetException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
     return jpaEntity;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAWriteRequest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAWriteRequest.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAWriteRequest.java
index d8fd6d4..dc8e592 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAWriteRequest.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAWriteRequest.java
@@ -49,16 +49,14 @@ public class JPAWriteRequest {
     jpaComplexObjectMap = new HashMap<String, Object>();
   }
 
-  protected HashMap<String, Method> getSetters(final Object jpaEntity,
-      final EdmStructuralType structuralType, final boolean isCreate) throws ODataJPARuntimeException {
+  protected HashMap<String, Method> getSetters(final Object jpaEntity, final EdmStructuralType structuralType, final boolean isCreate) throws ODataJPARuntimeException {
 
     HashMap<String, Method> setters = new HashMap<String, Method>();
     HashMap<String, String> embeddableKey = new HashMap<String, String>();
     try {
       for (String propertyName : structuralType.getPropertyNames()) {
 
-        EdmProperty property = (EdmProperty) structuralType
-            .getProperty(propertyName);
+        EdmProperty property = (EdmProperty) structuralType.getProperty(propertyName);
         Class<?> propertyClass = null;
         try {
           if (property.getMapping() != null && ((JPAEdmMappingImpl) property.getMapping()).getJPAType() != null) {
@@ -71,22 +69,16 @@ public class JPAWriteRequest {
                   jpaComplexObjectMap.put(propertyName, propertyClass.newInstance());
                 }
               } catch (InstantiationException e) {
-                throw ODataJPARuntimeException
-                    .throwException(ODataJPARuntimeException.GENERAL
-                        .addContent(e.getMessage()), e);
+                throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
               } catch (IllegalAccessException e) {
-                throw ODataJPARuntimeException
-                    .throwException(ODataJPARuntimeException.GENERAL
-                        .addContent(e.getMessage()), e);
+                throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
               }
             }
           } else {
             propertyClass = EdmTypeConvertor.convertToJavaType(property.getType());
           }
         } catch (ODataJPAModelException e) {
-          throw ODataJPARuntimeException
-              .throwException(ODataJPARuntimeException.GENERAL
-                  .addContent(e.getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         }
         String name = getSetterName(property);
         String[] nameParts = name.split("\\.");
@@ -96,34 +88,24 @@ public class JPAWriteRequest {
             embeddableKey.put(propertyName, name);
           }
         } else {
-          setters.put(
-              propertyName,
-              jpaEntity.getClass().getMethod(name, propertyClass));
+          setters.put(propertyName, jpaEntity.getClass().getMethod(name, propertyClass));
         }
       }
     } catch (NoSuchMethodException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (SecurityException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     if (isCreate && !embeddableKey.isEmpty()) {
-      jpaEmbeddableKeyMap.put(jpaEntity.getClass().getName(),
-          embeddableKey);
+      jpaEmbeddableKeyMap.put(jpaEntity.getClass().getName(), embeddableKey);
     }
     return setters;
   }
 
-  private String getSetterName(final EdmProperty property)
-      throws ODataJPARuntimeException {
+  private String getSetterName(final EdmProperty property) throws ODataJPARuntimeException {
     EdmMapping mapping = null;
     String name = null;
     try {
@@ -135,9 +117,7 @@ public class JPAWriteRequest {
       }
 
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     String[] nameParts = name.split("\\."); //$NON-NLS-1$

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
index edc3da9..ecce1ad 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProvider.java
@@ -63,16 +63,14 @@ public class ODataJPAEdmProvider extends EdmProvider {
 
   public ODataJPAEdmProvider(final ODataJPAContext oDataJPAContext) {
     if (oDataJPAContext == null) {
-      throw new IllegalArgumentException(
-          ODataJPAException.ODATA_JPACTX_NULL);
+      throw new IllegalArgumentException(ODataJPAException.ODATA_JPACTX_NULL);
     }
     entityTypes = new HashMap<String, EntityType>();
     entityContainerInfos = new HashMap<String, EntityContainerInfo>();
     complexTypes = new HashMap<String, ComplexType>();
     associations = new HashMap<String, Association>();
     functionImports = new HashMap<String, FunctionImport>();
-    jpaEdmModel = ODataJPAFactory.createFactory().getJPAAccessFactory()
-        .getJPAEdmModelView(oDataJPAContext);
+    jpaEdmModel = ODataJPAFactory.createFactory().getJPAAccessFactory().getJPAEdmModelView(oDataJPAContext);
   }
 
   public ODataJPAContext getODataJPAContext() {
@@ -84,8 +82,7 @@ public class ODataJPAEdmProvider extends EdmProvider {
   }
 
   @Override
-  public EntityContainerInfo getEntityContainerInfo(final String name)
-      throws ODataException {
+  public EntityContainerInfo getEntityContainerInfo(final String name) throws ODataException {
 
     if (entityContainerInfos.containsKey(name)) {
       return entityContainerInfos.get(name);
@@ -95,7 +92,9 @@ public class ODataJPAEdmProvider extends EdmProvider {
         getSchemas();
       }
       List<EntityContainer> containerList = schemas.get(0).getEntityContainers();
-      if (containerList == null) return null;
+      if (containerList == null) {
+        return null;
+      }
       for (EntityContainer container : containerList) {
         if (name == null && container.isDefaultEntityContainer()) {
           entityContainerInfos.put(name, container);
@@ -109,8 +108,7 @@ public class ODataJPAEdmProvider extends EdmProvider {
   }
 
   @Override
-  public EntityType getEntityType(final FullQualifiedName edmFQName)
-      throws ODataException {
+  public EntityType getEntityType(final FullQualifiedName edmFQName) throws ODataException {
 
     String strEdmFQName = edmFQName.toString();
 
@@ -127,7 +125,9 @@ public class ODataJPAEdmProvider extends EdmProvider {
       for (Schema schema : schemas) {
         String schemaNamespace = schema.getNamespace();
         if (schemaNamespace.equals(entityTypeNamespace)) {
-          if (schema.getEntityTypes() == null) return null;
+          if (schema.getEntityTypes() == null) {
+            return null;
+          }
           for (EntityType et : schema.getEntityTypes()) {
             if (et.getName().equals(entityTypeName)) {
               entityTypes.put(strEdmFQName, et);
@@ -142,8 +142,7 @@ public class ODataJPAEdmProvider extends EdmProvider {
   }
 
   @Override
-  public ComplexType getComplexType(final FullQualifiedName edmFQName)
-      throws ODataException {
+  public ComplexType getComplexType(final FullQualifiedName edmFQName) throws ODataException {
 
     if (edmFQName != null) {
       if (complexTypes.containsKey(edmFQName.toString())) {
@@ -154,7 +153,9 @@ public class ODataJPAEdmProvider extends EdmProvider {
 
       for (Schema schema : schemas) {
         if (schema.getNamespace().equals(edmFQName.getNamespace())) {
-          if (schema.getComplexTypes() == null) return null;
+          if (schema.getComplexTypes() == null) {
+            return null;
+          }
           for (ComplexType ct : schema.getComplexTypes()) {
             if (ct.getName().equals(edmFQName.getName())) {
               complexTypes.put(edmFQName.toString(), ct);
@@ -169,8 +170,7 @@ public class ODataJPAEdmProvider extends EdmProvider {
   }
 
   @Override
-  public Association getAssociation(final FullQualifiedName edmFQName)
-      throws ODataException {
+  public Association getAssociation(final FullQualifiedName edmFQName) throws ODataException {
     if (edmFQName != null) {
       if (associations.containsKey(edmFQName.toString())) {
         return associations.get(edmFQName.toString());
@@ -180,12 +180,12 @@ public class ODataJPAEdmProvider extends EdmProvider {
 
       for (Schema schema : schemas) {
         if (schema.getNamespace().equals(edmFQName.getNamespace())) {
-          if (schema.getAssociations() == null) return null;
+          if (schema.getAssociations() == null) {
+            return null;
+          }
           for (Association association : schema.getAssociations()) {
-            if (association.getName().equals(
-                edmFQName.getName())) {
-              associations.put(edmFQName.toString(),
-                  association);
+            if (association.getName().equals(edmFQName.getName())) {
+              associations.put(edmFQName.toString(), association);
               return association;
             }
           }
@@ -197,16 +197,14 @@ public class ODataJPAEdmProvider extends EdmProvider {
   }
 
   @Override
-  public EntitySet getEntitySet(final String entityContainer, final String name)
-      throws ODataException {
+  public EntitySet getEntitySet(final String entityContainer, final String name) throws ODataException {
 
     EntitySet returnedSet = null;
     EntityContainer container = null;
     if (!entityContainerInfos.containsKey(entityContainer)) {
       container = (EntityContainer) getEntityContainerInfo(entityContainer);
     } else {
-      container = (EntityContainer) entityContainerInfos
-          .get(entityContainer);
+      container = (EntityContainer) entityContainerInfos.get(entityContainer);
     }
 
     if (container != null && name != null) {
@@ -222,29 +220,24 @@ public class ODataJPAEdmProvider extends EdmProvider {
   }
 
   @Override
-  public AssociationSet getAssociationSet(final String entityContainer,
-      final FullQualifiedName association, final String sourceEntitySetName,
-      final String sourceEntitySetRole) throws ODataException {
+  public AssociationSet getAssociationSet(final String entityContainer, final FullQualifiedName association, final String sourceEntitySetName, final String sourceEntitySetRole) throws ODataException {
 
     EntityContainer container = null;
     if (!entityContainerInfos.containsKey(entityContainer)) {
       container = (EntityContainer) getEntityContainerInfo(entityContainer);
     } else {
-      container = (EntityContainer) entityContainerInfos
-          .get(entityContainer);
+      container = (EntityContainer) entityContainerInfos.get(entityContainer);
     }
 
     if (container != null && association != null && container.getAssociationSets() != null) {
       for (AssociationSet as : container.getAssociationSets()) {
         if (association.equals(as.getAssociation())) {
           AssociationSetEnd end = as.getEnd1();
-          if (sourceEntitySetName.equals(end.getEntitySet())
-              && sourceEntitySetRole.equals(end.getRole())) {
+          if (sourceEntitySetName.equals(end.getEntitySet()) && sourceEntitySetRole.equals(end.getRole())) {
             return as;
           } else {
             end = as.getEnd2();
-            if (sourceEntitySetName.equals(end.getEntitySet())
-                && sourceEntitySetRole.equals(end.getRole())) {
+            if (sourceEntitySetName.equals(end.getEntitySet()) && sourceEntitySetRole.equals(end.getRole())) {
               return as;
             }
           }
@@ -255,8 +248,7 @@ public class ODataJPAEdmProvider extends EdmProvider {
   }
 
   @Override
-  public FunctionImport getFunctionImport(final String entityContainer, final String name)
-      throws ODataException {
+  public FunctionImport getFunctionImport(final String entityContainer, final String name) throws ODataException {
 
     if (functionImports.containsKey(name)) {
       return functionImports.get(name);
@@ -266,12 +258,13 @@ public class ODataJPAEdmProvider extends EdmProvider {
     if (!entityContainerInfos.containsKey(entityContainer)) {
       container = (EntityContainer) getEntityContainerInfo(entityContainer);
     } else {
-      container = (EntityContainer) entityContainerInfos
-          .get(entityContainer);
+      container = (EntityContainer) entityContainerInfos.get(entityContainer);
     }
 
     if (container != null && name != null) {
-      if (container.getFunctionImports() == null) return null;
+      if (container.getFunctionImports() == null) {
+        return null;
+      }
       for (FunctionImport fi : container.getFunctionImports()) {
         if (name.equals(fi.getName())) {
           functionImports.put(name, fi);
@@ -291,8 +284,7 @@ public class ODataJPAEdmProvider extends EdmProvider {
     }
     if (jpaEdmModel == null) {
 
-      throw ODataJPAModelException.throwException(
-          ODataJPAModelException.BUILDER_NULL, null);
+      throw ODataJPAModelException.throwException(ODataJPAModelException.BUILDER_NULL, null);
     }
 
     return schemas;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
index 2039efc..72118da 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/exception/ODataJPAMessageServiceDefault.java
@@ -70,14 +70,11 @@ public class ODataJPAMessageServiceDefault implements ODataJPAMessageService {
     } catch (MissingResourceException e) {
       return "Missing message for key '" + key + "'!";
     } catch (MissingFormatArgumentException e) {
-      return "Missing replacement for place holder in value '" + value
-          + "' for following arguments '"
-          + Arrays.toString(contentAsArray) + "'!";
+      return "Missing replacement for place holder in value '" + value + "' for following arguments '" + Arrays.toString(contentAsArray) + "'!";
     }
   }
 
-  private ODataJPAMessageServiceDefault(final ResourceBundle resourceBundle,
-      final Locale locale) {
+  private ODataJPAMessageServiceDefault(final ResourceBundle resourceBundle, final Locale locale) {
     this.resourceBundle = resourceBundle;
     lanLocale = locale;
   }
@@ -101,18 +98,15 @@ public class ODataJPAMessageServiceDefault implements ODataJPAMessageService {
       }
     }
 
-    ODataJPAMessageService messagesInstance = LOCALE_2_MESSAGE_SERVICE
-        .get(acceptedLocale);
+    ODataJPAMessageService messagesInstance = LOCALE_2_MESSAGE_SERVICE.get(acceptedLocale);
     if (messagesInstance == null) {
       ResourceBundle resourceBundle = ResourceBundle.getBundle(BUNDLE_NAME, acceptedLocale);
 
       if (resourceBundle != null) {
-        messagesInstance = new ODataJPAMessageServiceDefault(
-            resourceBundle, acceptedLocale);
+        messagesInstance = new ODataJPAMessageServiceDefault(resourceBundle, acceptedLocale);
         LOCALE_2_MESSAGE_SERVICE.put(acceptedLocale, messagesInstance);
       } else if (defaultResourceBundle != null) {
-        messagesInstance = new ODataJPAMessageServiceDefault(
-            defaultResourceBundle, null);
+        messagesInstance = new ODataJPAMessageServiceDefault(defaultResourceBundle, null);
       }
 
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
index ca843a9..2f6da6e 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/factory/ODataJPAFactoryImpl.java
@@ -114,8 +114,7 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
         contextBuilder = singleSelectContext.new JPQLSelectSingleContextBuilder();
         break;
       case JOIN:
-        JPQLJoinSelectContext joinContext = new JPQLJoinSelectContext(
-            false);
+        JPQLJoinSelectContext joinContext = new JPQLJoinSelectContext(false);
         contextBuilder = joinContext.new JPQLJoinContextBuilder();
         break;
       case JOIN_SINGLE:
@@ -123,13 +122,11 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
         contextBuilder = joinSingleContext.new JPQLJoinSelectSingleContextBuilder();
         break;
       case SELECT_COUNT:
-        JPQLSelectContext selectCountContext = new JPQLSelectContext(
-            true);
+        JPQLSelectContext selectCountContext = new JPQLSelectContext(true);
         contextBuilder = selectCountContext.new JPQLSelectContextBuilder();
         break;
       case JOIN_COUNT:
-        JPQLJoinSelectContext joinCountContext = new JPQLJoinSelectContext(
-            true);
+        JPQLJoinSelectContext joinCountContext = new JPQLJoinSelectContext(true);
         contextBuilder = joinCountContext.new JPQLJoinContextBuilder();
       default:
         break;
@@ -147,8 +144,7 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
     }
 
     @Override
-    public JPAMethodContextBuilder getJPAMethodContextBuilder(
-        final JPQLContextType contextType) {
+    public JPAMethodContextBuilder getJPAMethodContextBuilder(final JPQLContextType contextType) {
 
       JPAMethodContextBuilder contextBuilder = null;
       switch (contextType) {
@@ -165,16 +161,14 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
 
   }
 
-  private static class ODataJPAAccessFactoryImpl implements
-      ODataJPAAccessFactory {
+  private static class ODataJPAAccessFactoryImpl implements ODataJPAAccessFactory {
 
     private static ODataJPAAccessFactoryImpl factory = null;
 
     private ODataJPAAccessFactoryImpl() {}
 
     @Override
-    public ODataSingleProcessor createODataProcessor(
-        final ODataJPAContext oDataJPAContext) {
+    public ODataSingleProcessor createODataProcessor(final ODataJPAContext oDataJPAContext) {
       return new ODataJPAProcessorDefault(oDataJPAContext);
     }
 
@@ -210,8 +204,7 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
     private JPAAccessFactoryImpl() {}
 
     @Override
-    public JPAEdmModelView getJPAEdmModelView(
-        final ODataJPAContext oDataJPAContext) {
+    public JPAEdmModelView getJPAEdmModelView(final ODataJPAContext oDataJPAContext) {
       JPAEdmModelView view = null;
 
       view = new JPAEdmModel(oDataJPAContext);
@@ -234,10 +227,8 @@ public class ODataJPAFactoryImpl extends ODataJPAFactory {
     }
 
     @Override
-    public JPAEdmMappingModelAccess getJPAEdmMappingModelAccess(
-        final ODataJPAContext oDataJPAContext) {
-      JPAEdmMappingModelAccess mappingModelAccess = new JPAEdmMappingModelService(
-          oDataJPAContext);
+    public JPAEdmMappingModelAccess getJPAEdmMappingModelAccess(final ODataJPAContext oDataJPAContext) {
+      JPAEdmMappingModelAccess mappingModelAccess = new JPAEdmMappingModelService(oDataJPAContext);
 
       return mappingModelAccess;
     }


[03/22] remove @author - javadoc warning

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
index 4e50e53..434b489 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Manager.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @author
+ *  
  */
 public class Manager extends Employee {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
index 422b4ff..f3f3a20 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/ModelException.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.odata2.ref.model;
 
 /**
- * @author
+ *  
  */
 public class ModelException extends RuntimeException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
index 3dc91e7..ef8b7b7 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Photo.java
@@ -24,7 +24,7 @@ import java.io.InputStream;
 import java.util.Arrays;
 
 /**
- * @author
+ *  
  */
 public class Photo {
   private static final String RESOURCE = "/male_1_WinterW.jpg";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
index b4906f7..e96f57f 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Room.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-* @author
+*  
 */
 public class Room {
   private final int id;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
index 53b4050..d99b05e 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Team.java
@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
-* @author
+*  
 */
 public class Team {
   private final int id;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
index a443456..f235f16 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsDataSource.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.api.exception.ODataNotImplementedException;
  * <li>Following navigation paths must only be done step by step.</li>
  * </ul>
  * </p>
- * @author
+ *  
  */
 public interface ListsDataSource {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
index 25cf880..f93b26d 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ListsProcessor.java
@@ -120,7 +120,7 @@ import org.apache.olingo.odata2.ref.processor.ListsDataSource.BinaryData;
  * Implementation of the centralized parts of OData processing,
  * allowing to use the simplified {@link ListsDataSource} for the
  * actual data handling.
- * @author
+ *  
  */
 public class ListsProcessor extends ODataSingleProcessor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
index c2f9e2f..fd64872 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioDataSource.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.ref.model.Team;
 
 /**
  * Data for the reference scenario
- * @author
+ *  
  */
 public class ScenarioDataSource implements ListsDataSource {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
index 7f23c6b..484f2ee 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioErrorCallback.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
 
 /**
  * Callback for handling errors by logging internal server errors additionally.
- * @author
+ *  
  */
 public class ScenarioErrorCallback implements ODataErrorCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
index 174c7be..8a4667d 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/processor/ScenarioServiceFactory.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.ref.edm.ScenarioEdmProvider;
 import org.apache.olingo.odata2.ref.model.DataContainer;
 
 /**
- * @author
+ *  
  */
 public class ScenarioServiceFactory extends ODataServiceFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
index 6809759..397281c 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/BuildingTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class BuildingTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
index 96ebadd..fa38d1f 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/DataContainerTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class DataContainerTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
index fe06487..2e7a5ed 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/EmployeeTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EmployeeTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
index 71e3201..ad23b2a 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/ManagerTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class ManagerTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
index 0df5ac4..2c8fdef 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/RoomTest.java
@@ -29,7 +29,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class RoomTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
index 89b6ebd..7d35c8c 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/model/TeamTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class TeamTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
index b938ae8..94161b4 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntitySetTest.java
@@ -49,7 +49,7 @@ import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EntitySetTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
index 1ca0d6f..cc048a1 100644
--- a/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
+++ b/odata-ref/src/test/java/org/apache/olingo/odata2/ref/read/EntityTest.java
@@ -54,7 +54,7 @@ import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EntityTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
index 616f27c..b3b2f7a 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/TestUtilRuntimeException.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.testutil;
 
 /**
  * This class is a helper to throw RuntimeExceptions in test util methods
- * @author
+ *  
  *
  */
 public class TestUtilRuntimeException extends RuntimeException {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
index c09cc26..74fda3d 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/AbstractFitTest.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.testutil.server.ServerRuntimeException;
 import org.apache.olingo.odata2.testutil.server.TestServer;
 
 /**
- * @author
+ *  
  */
 public abstract class AbstractFitTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
index 1f50121..8681aa4 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/BaseTest.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  * Provides basic support for JUnit tests<br>
  * - log & tracing
  * 
- * @author
+ *  
  */
 public abstract class BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
index 9c429af..5a63e58 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitErrorCallback.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.processor.ODataErrorContext;
 import org.apache.olingo.odata2.api.processor.ODataResponse;
 
 /**
- * @author
+ *  
  */
 public class FitErrorCallback implements ODataErrorCallback {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
index 8b5755b..ea1d7a4 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/fit/FitStaticServiceFactory.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.processor.ODataContext;
 import org.apache.olingo.odata2.testutil.server.TestServer;
 
 /**
- * @author
+ *  
  */
 public class FitStaticServiceFactory extends ODataServiceFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
index 8bec23c..8100b72 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ClassHelper.java
@@ -29,7 +29,7 @@ import java.util.List;
 import java.util.Locale;
 
 /**
- * @author
+ *  
  */
 public class ClassHelper {
   public static final FileFilter JAVA_FILE_FILTER = new FileFilter() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
index 32179c4..3a1339e 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ODataMessageTextVerifier.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
  * test whether all fields of type {@link MessageReference} of
  * the tested (Exception) class are provided in the <b>i18n.properties</b> file.
  * 
- * @author
+ *  
  */
 public class ODataMessageTextVerifier {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
index bda6aa4..c4a2a9f 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/ProcessLocker.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
 /**
  * Interprocess synchronization to enable parallel test executions.
  * 
- * @author
+ *  
  */
 public class ProcessLocker {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
index e3704af..cc2d3e0 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/StringHelper.java
@@ -31,7 +31,7 @@ import org.apache.http.HttpEntity;
 import org.apache.olingo.odata2.testutil.TestUtilRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class StringHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
index 64e5fc8..fa2520d 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/helper/XMLUnitHelper.java
@@ -26,7 +26,7 @@ import org.junit.Assert;
 
 /**
  * Helper for XML unit tests.
- * @author
+ *  
  */
 public class XMLUnitHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
index 22d1f18..005bb13 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/EdmMock.java
@@ -53,7 +53,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
 
 /**
  * Mocked Entity Data Model, more or less aligned to the Reference Scenario.
- * @author
+ *  
  */
 class EdmMock {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
index 8baaa27..10085c0 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/MockFacade.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.PathSegment;
 
 /**
  * Mocked Entity Data Model, more or less aligned to the Reference Scenario.
- * @author
+ *  
  */
 public class MockFacade {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
index d8fff62..420c7b1 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/SampleClassForInvalidMessageReferences.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
 import org.apache.olingo.odata2.api.exception.ODataMessageException;
 
 /**
- * @author
+ *  
  */
 public class SampleClassForInvalidMessageReferences extends ODataMessageException
 {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
index 748ad26..af1aed2 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TecEdmInfo.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmException;
 
 /**
  * Helper for the entity data model used as technical reference scenario.
- * @author
+ *  
  */
 public class TecEdmInfo
 {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
index d84fb40..2abc0c8 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/mock/TechnicalScenarioEdmProvider.java
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
 
 /**
  * Provider for the entity data model used as technical reference scenario
- * @author
+ *  
  */
 public class TechnicalScenarioEdmProvider extends EdmProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
index c9a2781..aa43be4 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/ServerRuntimeException.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.odata2.testutil.server;
 
 /**
- * @author
+ *  
  */
 public class ServerRuntimeException extends RuntimeException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
----------------------------------------------------------------------
diff --git a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
index 2764c41..4243551 100644
--- a/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
+++ b/odata-testutil/src/main/java/org/apache/olingo/odata2/testutil/server/TestServer.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.ODataServiceFactory;
 import org.apache.olingo.odata2.testutil.fit.FitStaticServiceFactory;
 
 /**
- * @author
+ *  
  */
 public class TestServer {
   private static final Logger log = Logger.getLogger(TestServer.class);


[12/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/parser/EdmParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/parser/EdmParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/parser/EdmParserTest.java
index 4ef463d..9860fef 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/parser/EdmParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/parser/EdmParserTest.java
@@ -77,160 +77,17 @@ public class EdmParserTest {
   private static final String ASSOCIATION = "ManagerEmployees";
   private static final int MAX_LENGTH = 4;
 
-  private final String[] propertyNames = { "EmployeeId", "EmployeeName",
-      "Location" };
+  private final String[] propertyNames = { "EmployeeId", "EmployeeName", "Location" };
 
-  private final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-      + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-      + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-      + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\""
-      + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-      + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-      + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-      + "<Property Name=\"" + propertyNames[0]
-      + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-      + "<Property Name=\"" + propertyNames[1]
-      + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
-      + "<Property Name=\"" + propertyNames[2]
-      + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
-      + "</EntityType>" + "<ComplexType Name=\"c_Location\">"
-      + "<Property Name=\"Country\" Type=\"Edm.String\"/>"
-      + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>"
-      + "</edmx:Edmx>";
+  private final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
 
-  private final String xmlWithBaseType = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-      + Edm.NAMESPACE_EDMX_2007_06
-      + "\">"
-      + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-      + Edm.NAMESPACE_M_2007_08
-      + "\">"
-      + "<Schema Namespace=\""
-      + NAMESPACE
-      + "\" xmlns=\""
-      + Edm.NAMESPACE_EDM_2008_09
-      + "\">"
-      + "<EntityType Name= \"Employee\">"
-      + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-      + "<Property Name=\""
-      + propertyNames[0]
-      + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-      + "<Property Name=\""
-      + propertyNames[1]
-      + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
-      + "<Property Name=\""
-      + propertyNames[2]
-      + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
-      + "</EntityType>"
-      + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-      + "</EntityType>"
-      + "<ComplexType Name=\"c_Location\">"
-      + "<Property Name=\"Country\" Type=\"Edm.String\"/>"
-      + "</ComplexType>"
-      + "</Schema>"
-      + "</edmx:DataServices>"
-      + "</edmx:Edmx>";
+  private final String xmlWithBaseType = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
 
-  private final String xmlWithAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-      + Edm.NAMESPACE_EDMX_2007_06
-      + "\">"
-      + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-      + Edm.NAMESPACE_M_2007_08
-      + "\">"
-      + "<Schema Namespace=\""
-      + NAMESPACE
-      + "\" xmlns=\""
-      + Edm.NAMESPACE_EDM_2008_09
-      + "\">"
-      + "<EntityType Name= \"Employee\">"
-      + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-      + "<Property Name=\""
-      + propertyNames[0]
-      + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-      + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-      + "</EntityType>"
-      + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-      + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />"
-      + "</EntityType>"
-      + "<Association Name=\""
-      + ASSOCIATION
-      + "\">"
-      + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">"
-      + "<OnDelete Action=\"Cascade\"/>"
-      + "</End>"
-      + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-      + "</Association>"
-      + "</Schema>"
-      + "<Schema Namespace=\""
-      + NAMESPACE2
-      + "\" xmlns=\""
-      + Edm.NAMESPACE_EDM_2008_09
-      + "\">"
-      + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-      + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-      + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>"
-      + "<AssociationSet Name=\""
-      + ASSOCIATION
-      + "\" Association=\"RefScenario."
-      + ASSOCIATION
-      + "\">"
-      + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>"
-      + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>"
-      + "</AssociationSet>"
-      + "</EntityContainer>"
-      + "</Schema>"
-      + "</edmx:DataServices>" + "</edmx:Edmx>";
+  private final String xmlWithAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
+      + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">" + "<OnDelete Action=\"Cascade\"/>" + "</End>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
 
-  private final String xmlWithTwoSchemas = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-      + Edm.NAMESPACE_EDMX_2007_06
-      + "\">"
-      + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-      + Edm.NAMESPACE_M_2007_08
-      + "\">"
-      + "<Schema Namespace=\""
-      + NAMESPACE
-      + "\" xmlns=\""
-      + Edm.NAMESPACE_EDM_2008_09
-      + "\">"
-      + "<EntityType Name= \"Employee\">"
-      + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-      + "<Property Name=\""
-      + propertyNames[0]
-      + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-      + "<Property Name=\""
-      + propertyNames[1]
-      + "\" Type=\"Edm.String\"/>"
-      + "</EntityType>"
-      + "</Schema>"
-      + "<Schema Namespace=\""
-      + NAMESPACE2
-      + "\" xmlns=\""
-      + Edm.NAMESPACE_EDM_2008_09
-      + "\">"
-      + "<EntityType Name= \"Photo\">"
-      + "<Key><PropertyRef Name=\"Id\"/></Key>"
-      + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\""
-      + MAX_LENGTH
-      + "\"/>"
-      + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\""
-      + DEFAULT_VALUE
-      + "\" FixedLength=\"false\"/>"
-      + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\""
-      + MIME_TYPE
-      + "\"/>"
-      + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\""
-      + FC_TARGET_PATH
-      + "\" m:FC_NsUri=\""
-      + FC_NS_URI
-      + "\""
-      + " m:FC_NsPrefix=\""
-      + FC_NS_PREFIX
-      + "\" m:FC_KeepInContent=\""
-      + FC_KEEP_IN_CONTENT
-      + "\" m:FC_ContentKind=\"text\" >"
-      + "</Property>"
-      + "</EntityType>"
-      + "</Schema>"
-      + "</edmx:DataServices>" + "</edmx:Edmx>";
+  private final String xmlWithTwoSchemas = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\"/>" + "</EntityType>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">" + "<Key><PropertyRef Name=\"Id\"/></Key>" + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\"" + MAX_LENGTH + "\"/>" + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\"" + DEFAULT_VALUE
+      + "\" FixedLength=\"false\"/>" + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\"" + MIME_TYPE + "\"/>" + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\"" + FC_TARGET_PATH + "\" m:FC_NsUri=\"" + FC_NS_URI + "\"" + " m:FC_NsPrefix=\"" + FC_NS_PREFIX + "\" m:FC_KeepInContent=\"" + FC_KEEP_IN_CONTENT + "\" m:FC_ContentKind=\"text\" >" + "</Property>" + "</EntityType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
 
   @Test
   public void test() throws XMLStreamException, EntityProviderException {
@@ -244,12 +101,10 @@ public class EdmParserTest {
       assertEquals(1, schema.getEntityTypes().size());
       assertEquals("Employee", schema.getEntityTypes().get(0).getName());
       assertEquals(Boolean.TRUE, schema.getEntityTypes().get(0).isHasStream());
-      for (PropertyRef propertyRef : schema.getEntityTypes().get(0)
-          .getKey().getKeys()) {
+      for (PropertyRef propertyRef : schema.getEntityTypes().get(0).getKey().getKeys()) {
         assertEquals("EmployeeId", propertyRef.getName());
       }
-      for (Property property : schema.getEntityTypes().get(0)
-          .getProperties()) {
+      for (Property property : schema.getEntityTypes().get(0).getProperties()) {
         assertEquals(propertyNames[i], property.getName());
         if ("Location".equals(property.getName())) {
           ComplexProperty cProperty = (ComplexProperty) property;
@@ -263,14 +118,12 @@ public class EdmParserTest {
         i++;
       }
       assertEquals(1, schema.getComplexTypes().size());
-      assertEquals("c_Location", schema.getComplexTypes().get(0)
-          .getName());
+      assertEquals("c_Location", schema.getComplexTypes().get(0).getName());
     }
   }
 
   @Test
-  public void testBaseType() throws XMLStreamException,
-      EntityProviderException {
+  public void testBaseType() throws XMLStreamException, EntityProviderException {
     int i = 0;
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithBaseType);
@@ -280,12 +133,10 @@ public class EdmParserTest {
       assertEquals(NAMESPACE, schema.getNamespace());
       assertEquals(2, schema.getEntityTypes().size());
       assertEquals("Employee", schema.getEntityTypes().get(0).getName());
-      for (PropertyRef propertyRef : schema.getEntityTypes().get(0)
-          .getKey().getKeys()) {
+      for (PropertyRef propertyRef : schema.getEntityTypes().get(0).getKey().getKeys()) {
         assertEquals("EmployeeId", propertyRef.getName());
       }
-      for (Property property : schema.getEntityTypes().get(0)
-          .getProperties()) {
+      for (Property property : schema.getEntityTypes().get(0).getProperties()) {
         assertEquals(propertyNames[i], property.getName());
         i++;
       }
@@ -294,29 +145,9 @@ public class EdmParserTest {
   }
 
   @Test
-  public void testComplexTypeWithBaseType() throws XMLStreamException,
-      EntityProviderException {
-    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08 + "\">"
-        + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\"  xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\"" + propertyNames[2]
-        + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
-        + "</EntityType>"
-        + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">"
-        + "<Property Name=\"Country\" Type=\"Edm.String\"/>"
-        + "</ComplexType>"
-        + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.c_BaseType_for_Location\">"
-        + "</ComplexType>"
-        + "<ComplexType Name=\"c_Other_Location\" BaseType=\"RS.c_BaseType_for_Location\">"
-        + "</ComplexType>"
-        + "</Schema>" + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+  public void testComplexTypeWithBaseType() throws XMLStreamException, EntityProviderException {
+    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\"  xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.c_BaseType_for_Location\">" + "</ComplexType>" + "<ComplexType Name=\"c_Other_Location\" BaseType=\"RS.c_BaseType_for_Location\">" + "</ComplexType>" + "</Schema>"
+        + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xml);
     DataServices result = parser.readMetadata(reader, true);
@@ -328,14 +159,12 @@ public class EdmParserTest {
           assertTrue(!complexType.isAbstract());
           assertEquals("c_BaseType_for_Location", complexType.getBaseType().getName());
           assertEquals("RefScenario", complexType.getBaseType().getNamespace());
-        }
-        else if ("c_Other_Location".equals(complexType.getName())) {
+        } else if ("c_Other_Location".equals(complexType.getName())) {
           assertNotNull(complexType.getBaseType());
           assertTrue(!complexType.isAbstract());
           assertEquals("c_BaseType_for_Location", complexType.getBaseType().getName());
           assertEquals("RS", complexType.getBaseType().getNamespace());
-        }
-        else if ("c_BaseType_for_Location".equals(complexType.getName())) {
+        } else if ("c_BaseType_for_Location".equals(complexType.getName())) {
           assertNotNull(complexType.isAbstract());
           assertTrue(complexType.isAbstract());
         } else {
@@ -347,62 +176,23 @@ public class EdmParserTest {
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testComplexTypeWithInvalidBaseType() throws XMLStreamException,
-      EntityProviderException {
-    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\""
-        + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\"" + propertyNames[2]
-        + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
-        + "</EntityType>"
-        + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">"
-        + "<Property Name=\"Country\" Type=\"Edm.String\"/>"
-        + "</ComplexType>"
-        + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.Employee\">"
-        + "</ComplexType>"
-        + "</Schema>" + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+  public void testComplexTypeWithInvalidBaseType() throws XMLStreamException, EntityProviderException {
+    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<ComplexType Name=\"c_Location\" BaseType=\"RefScenario.Employee\">" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xml);
     parser.readMetadata(reader, true);
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testComplexTypeWithInvalidBaseType2() throws XMLStreamException,
-      EntityProviderException {
-    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\""
-        + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\"" + propertyNames[2]
-        + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
-        + "</EntityType>"
-        + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">"
-        + "<Property Name=\"Country\" Type=\"Edm.String\"/>"
-        + "</ComplexType>"
-        + "<ComplexType Name=\"c_Location\" BaseType=\"c_BaseType_for_Location\">"
-        + "</ComplexType>"
-        + "</Schema>" + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+  public void testComplexTypeWithInvalidBaseType2() throws XMLStreamException, EntityProviderException {
+    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "</EntityType>" + "<ComplexType Name=\"c_BaseType_for_Location\" Abstract=\"true\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<ComplexType Name=\"c_Location\" BaseType=\"c_BaseType_for_Location\">" + "</ComplexType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xml);
     parser.readMetadata(reader, true);
   }
 
   @Test
-  public void testAssociation() throws XMLStreamException,
-      EntityProviderException {
+  public void testAssociation() throws XMLStreamException, EntityProviderException {
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithAssociation);
     DataServices result = parser.readMetadata(reader, true);
@@ -410,35 +200,27 @@ public class EdmParserTest {
     for (Schema schema : result.getSchemas()) {
       for (EntityType entityType : schema.getEntityTypes()) {
         if ("Manager".equals(entityType.getName())) {
-          assertEquals("RefScenario", entityType.getBaseType()
-              .getNamespace());
+          assertEquals("RefScenario", entityType.getBaseType().getNamespace());
           assertEquals("Employee", entityType.getBaseType().getName());
-          for (NavigationProperty navProperty : entityType
-              .getNavigationProperties()) {
+          for (NavigationProperty navProperty : entityType.getNavigationProperties()) {
             assertEquals("r_Manager", navProperty.getFromRole());
             assertEquals("r_Employees", navProperty.getToRole());
-            assertEquals("RefScenario", navProperty
-                .getRelationship().getNamespace());
-            assertEquals(ASSOCIATION, navProperty.getRelationship()
-                .getName());
+            assertEquals("RefScenario", navProperty.getRelationship().getNamespace());
+            assertEquals(ASSOCIATION, navProperty.getRelationship().getName());
           }
         }
         if ("Employee".equals(entityType.getName())) {
-          for (NavigationProperty navProperty : entityType
-              .getNavigationProperties()) {
+          for (NavigationProperty navProperty : entityType.getNavigationProperties()) {
             assertEquals("r_Employees", navProperty.getFromRole());
-            assertEquals("RefScenario", navProperty
-                .getRelationship().getNamespace());
-            assertEquals(ASSOCIATION, navProperty.getRelationship()
-                .getName());
+            assertEquals("RefScenario", navProperty.getRelationship().getNamespace());
+            assertEquals(ASSOCIATION, navProperty.getRelationship().getName());
           }
         }
       }
       for (Association association : schema.getAssociations()) {
         AssociationEnd end;
         assertEquals(ASSOCIATION, association.getName());
-        if ("Employee"
-            .equals(association.getEnd1().getType().getName())) {
+        if ("Employee".equals(association.getEnd1().getType().getName())) {
           end = association.getEnd1();
         } else {
           end = association.getEnd2();
@@ -451,8 +233,7 @@ public class EdmParserTest {
   }
 
   @Test
-  public void testTwoSchemas() throws XMLStreamException,
-      EntityProviderException {
+  public void testTwoSchemas() throws XMLStreamException, EntityProviderException {
     int i = 0;
     String schemasNs[] = { NAMESPACE, NAMESPACE2 };
     EdmParser parser = new EdmParser();
@@ -469,8 +250,7 @@ public class EdmParserTest {
   }
 
   @Test
-  public void testProperties() throws EntityProviderException,
-      XMLStreamException {
+  public void testProperties() throws EntityProviderException, XMLStreamException {
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithTwoSchemas);
     DataServices result = parser.readMetadata(reader, true);
@@ -489,43 +269,26 @@ public class EdmParserTest {
           for (Property property : entityType.getProperties()) {
             SimpleProperty sProperty = (SimpleProperty) property;
             if ("Id".equals(property.getName())) {
-              assertEquals(Boolean.FALSE, property.getFacets()
-                  .isNullable());
-              assertEquals(EdmConcurrencyMode.Fixed, property
-                  .getFacets().getConcurrencyMode());
-              assertEquals(new Integer(MAX_LENGTH), property
-                  .getFacets().getMaxLength());
+              assertEquals(Boolean.FALSE, property.getFacets().isNullable());
+              assertEquals(EdmConcurrencyMode.Fixed, property.getFacets().getConcurrencyMode());
+              assertEquals(new Integer(MAX_LENGTH), property.getFacets().getMaxLength());
 
-              assertEquals(EdmSimpleTypeKind.Int32,
-                  sProperty.getType());
+              assertEquals(EdmSimpleTypeKind.Int32, sProperty.getType());
               assertNull(property.getCustomizableFeedMappings());
             }
             if ("Name".equals(property.getName())) {
-              assertEquals(Boolean.TRUE, property.getFacets()
-                  .isUnicode());
-              assertEquals(DEFAULT_VALUE, property.getFacets()
-                  .getDefaultValue());
-              assertEquals(Boolean.FALSE, property.getFacets()
-                  .isFixedLength());
-              assertEquals(EdmSimpleTypeKind.String,
-                  sProperty.getType());
+              assertEquals(Boolean.TRUE, property.getFacets().isUnicode());
+              assertEquals(DEFAULT_VALUE, property.getFacets().getDefaultValue());
+              assertEquals(Boolean.FALSE, property.getFacets().isFixedLength());
+              assertEquals(EdmSimpleTypeKind.String, sProperty.getType());
               assertNull(property.getCustomizableFeedMappings());
             }
             if ("Содержание".equals(property.getName())) {
-              assertEquals(FC_TARGET_PATH, property
-                  .getCustomizableFeedMappings()
-                  .getFcTargetPath());
-              assertEquals(FC_NS_URI, property
-                  .getCustomizableFeedMappings().getFcNsUri());
-              assertEquals(FC_NS_PREFIX, property
-                  .getCustomizableFeedMappings()
-                  .getFcNsPrefix());
-              assertEquals(FC_KEEP_IN_CONTENT, property
-                  .getCustomizableFeedMappings()
-                  .isFcKeepInContent());
-              assertEquals(EdmContentKind.text, property
-                  .getCustomizableFeedMappings()
-                  .getFcContentKind());
+              assertEquals(FC_TARGET_PATH, property.getCustomizableFeedMappings().getFcTargetPath());
+              assertEquals(FC_NS_URI, property.getCustomizableFeedMappings().getFcNsUri());
+              assertEquals(FC_NS_PREFIX, property.getCustomizableFeedMappings().getFcNsPrefix());
+              assertEquals(FC_KEEP_IN_CONTENT, property.getCustomizableFeedMappings().isFcKeepInContent());
+              assertEquals(EdmContentKind.text, property.getCustomizableFeedMappings().getFcContentKind());
             }
             if ("BinaryData".equals(property.getName())) {
               assertEquals(MIME_TYPE, property.getMimeType());
@@ -537,34 +300,8 @@ public class EdmParserTest {
   }
 
   @Test
-  public void testEntitySet() throws XMLStreamException,
-      EntityProviderException {
-    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\""
-        + propertyNames[1]
-        + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+  public void testEntitySet() throws XMLStreamException, EntityProviderException {
+    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
     DataServices result = parser.readMetadata(reader, true);
@@ -574,18 +311,15 @@ public class EdmParserTest {
         assertEquals(Boolean.TRUE, container.isDefaultEntityContainer());
         for (EntitySet entitySet : container.getEntitySets()) {
           assertEquals("Employees", entitySet.getName());
-          assertEquals("Employee", entitySet.getEntityType()
-              .getName());
-          assertEquals(NAMESPACE, entitySet.getEntityType()
-              .getNamespace());
+          assertEquals("Employee", entitySet.getEntityType().getName());
+          assertEquals(NAMESPACE, entitySet.getEntityType().getNamespace());
         }
       }
     }
   }
 
   @Test
-  public void testAssociationSet() throws XMLStreamException,
-      EntityProviderException {
+  public void testAssociationSet() throws XMLStreamException, EntityProviderException {
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithAssociation);
     DataServices result = parser.readMetadata(reader, true);
@@ -611,36 +345,9 @@ public class EdmParserTest {
   }
 
   @Test
-  public void testFunctionImport() throws XMLStreamException,
-      EntityProviderException {
-    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\""
-        + propertyNames[1]
-        + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-        + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" EntitySet=\"Employees\" m:HttpMethod=\"GET\">"
-        + "<Parameter Name=\"q\" Type=\"Edm.String\" Nullable=\"true\" />"
-        + "</FunctionImport>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "</edmx:DataServices>" + "</edmx:Edmx>";
+  public void testFunctionImport() throws XMLStreamException, EntityProviderException {
+    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" EntitySet=\"Employees\" m:HttpMethod=\"GET\">" + "<Parameter Name=\"q\" Type=\"Edm.String\" Nullable=\"true\" />"
+        + "</FunctionImport>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
     DataServices result = parser.readMetadata(reader, true);
@@ -668,26 +375,7 @@ public class EdmParserTest {
 
   @Test()
   public void testAlias() throws XMLStreamException, EntityProviderException {
-    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" Alias=\"RS\"  xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RS.Employee\" m:HasStream=\"true\">"
-        + "</EntityType>" + "</Schema>" + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\"  xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RS.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xml);
     DataServices result = parser.readMetadata(reader, true);
@@ -705,97 +393,33 @@ public class EdmParserTest {
 
   @Test(expected = EntityProviderException.class)
   public void testEntityTypeWithoutKeys() throws XMLStreamException, EntityProviderException {
-    final String xmlWithoutKeys = "<Schema Namespace=\"" + NAMESPACE
-        + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\">" + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "</EntityType>" + "</Schema>";
+    final String xmlWithoutKeys = "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "</Schema>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithoutKeys);
     parser.readMetadata(reader, true);
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testInvalidBaseType() throws XMLStreamException,
-      EntityProviderException {
-    final String xmlWithInvalidBaseType = "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Manager\" BaseType=\"Employee\" m:HasStream=\"true\">"
-        + "</EntityType>" + "</Schema>";
+  public void testInvalidBaseType() throws XMLStreamException, EntityProviderException {
+    final String xmlWithInvalidBaseType = "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Manager\" BaseType=\"Employee\" m:HasStream=\"true\">" + "</EntityType>" + "</Schema>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidBaseType);
     parser.readMetadata(reader, true);
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testInvalidRole() throws XMLStreamException,
-      EntityProviderException {
-    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"Manager\" ToRole=\"Employees\" />"
-        + "</EntityType>"
-        + "<Association Name=\"ManagerEmployees\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association>"
-        + "</Schema>"
-        + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+  public void testInvalidRole() throws XMLStreamException, EntityProviderException {
+    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"Manager\" ToRole=\"Employees\" />" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "</Schema>"
+        + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
     parser.readMetadata(reader, true);
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testInvalidRelationship() throws XMLStreamException,
-      EntityProviderException {
-    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployee\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "</EntityType>"
-        + "<Association Name=\"ManagerEmployees\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association>"
-        + "</Schema>"
-        + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+  public void testInvalidRelationship() throws XMLStreamException, EntityProviderException {
+    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployee\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "</Schema>"
+        + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
     parser.readMetadata(reader, true);
@@ -803,21 +427,7 @@ public class EdmParserTest {
 
   @Test(expected = EntityProviderException.class)
   public void testMissingRelationship() throws Exception {
-    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
-        + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "</EntityType>"
-        + "<Association Name=\"ManagerEmployees\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
     try {
@@ -833,24 +443,8 @@ public class EdmParserTest {
 
   @Test(expected = EntityProviderException.class)
   public void testMissingEntityType() throws Exception {
-    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
-        + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" />"
-        + "</EntityContainer>"
-        + "<Association Name=\"ManagerEmployees\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" />" + "</EntityContainer>" + "<Association Name=\"ManagerEmployees\">"
+        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
     try {
@@ -866,21 +460,7 @@ public class EdmParserTest {
 
   @Test(expected = EntityProviderException.class)
   public void testMissingType() throws Exception {
-    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
-        + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0] + "\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "</EntityType>"
-        + "<Association Name=\"ManagerEmployees\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
     try {
@@ -896,21 +476,7 @@ public class EdmParserTest {
 
   @Test(expected = EntityProviderException.class)
   public void testMissingTypeAtAssociation() throws Exception {
-    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
-        + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "</EntityType>"
-        + "<Association Name=\"ManagerEmployees\">"
-        + "<End Multiplicity=\"*\" Role=\"r_Employees\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
+    final String xmlWithInvalidAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "</EntityType>" + "<Association Name=\"ManagerEmployees\">" + "<End Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association></Schema></edmx:DataServices></edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociation);
     try {
@@ -926,21 +492,7 @@ public class EdmParserTest {
 
   @Test(expected = EntityProviderException.class)
   public void testMissingTypeAtFunctionImport() throws Exception {
-    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-        + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" EntitySet=\"Employees\" m:HttpMethod=\"GET\">"
-        + "<Parameter Name=\"q\" Nullable=\"true\" />"
-        + "</FunctionImport>"
+    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<FunctionImport Name=\"EmployeeSearch\" ReturnType=\"Collection(RefScenario.Employee)\" EntitySet=\"Employees\" m:HttpMethod=\"GET\">" + "<Parameter Name=\"q\" Nullable=\"true\" />" + "</FunctionImport>"
         + "</EntityContainer></Schema></edmx:DataServices></edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xml);
@@ -957,25 +509,9 @@ public class EdmParserTest {
 
   @Test(expected = EntityProviderException.class)
   public void testMissingAssociation() throws Exception {
-    final String xmlWithAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
-        + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-        + "<AssociationSet Name=\"" + ASSOCIATION
-        //        + "\" Association=\"RefScenario." + ASSOCIATION 
-        + "\">"
-        + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>"
-        + "</AssociationSet>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "</edmx:DataServices></edmx:Edmx>";
+    final String xmlWithAssociation = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<AssociationSet Name=\"" + ASSOCIATION
+    //        + "\" Association=\"RefScenario." + ASSOCIATION 
+        + "\">" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices></edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithAssociation);
     try {
@@ -990,51 +526,9 @@ public class EdmParserTest {
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testInvalidAssociation() throws XMLStreamException,
-      EntityProviderException {
-    final String xmlWithInvalidAssociationSet = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />"
-        + "</EntityType>"
-        + "<Association Name=\""
-        + ASSOCIATION
-        + "\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">"
-        + "<OnDelete Action=\"Cascade\"/>"
-        + "</End>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-        + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>"
-        + "<AssociationSet Name=\""
-        + ASSOCIATION
-        + "\" Association=\"RefScenario2."
-        + ASSOCIATION
-        + "\">"
-        + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>"
-        + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>"
-        + "</AssociationSet>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "</edmx:DataServices>" + "</edmx:Edmx>";
+  public void testInvalidAssociation() throws XMLStreamException, EntityProviderException {
+    final String xmlWithInvalidAssociationSet = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
+        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">" + "<OnDelete Action=\"Cascade\"/>" + "</End>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociationSet);
     parser.readMetadata(reader, true);
@@ -1042,68 +536,11 @@ public class EdmParserTest {
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testInvalidAssociationEnd() throws XMLStreamException,
-      EntityProviderException {
+  public void testInvalidAssociationEnd() throws XMLStreamException, EntityProviderException {
     final String employees = "r_Employees";
     final String manager = "r_Manager";
-    final String xmlWithInvalidAssociationSetEnd = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
-        + employees
-        + "\" ToRole=\""
-        + manager
-        + "\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
-        + manager
-        + "\" ToRole=\""
-        + employees
-        + "\" />"
-        + "</EntityType>"
-        + "<Association Name=\""
-        + ASSOCIATION
-        + "\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\""
-        + employees
-        + "1"
-        + "\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\""
-        + manager
-        + "\"/>"
-        + "</Association>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-        + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>"
-        + "<AssociationSet Name=\""
-        + ASSOCIATION
-        + "\" Association=\"RefScenario2."
-        + ASSOCIATION
-        + "\">"
-        + "<End EntitySet=\"Managers\" Role=\""
-        + manager
-        + "\"/>"
-        + "<End EntitySet=\"Employees\" Role=\""
-        + employees
-        + "\"/>"
-        + "</AssociationSet>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "</edmx:DataServices>" + "</edmx:Edmx>";
+    final String xmlWithInvalidAssociationSetEnd = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + employees + "\" ToRole=\"" + manager + "\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + manager + "\" ToRole=\"" + employees + "\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
+        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"" + employees + "1" + "\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"" + manager + "\"/>" + "</Association>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "<End EntitySet=\"Employees\" Role=\"" + employees + "\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociationSetEnd);
     parser.readMetadata(reader, true);
@@ -1111,67 +548,11 @@ public class EdmParserTest {
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testInvalidAssociationEnd2() throws XMLStreamException,
-      EntityProviderException {
+  public void testInvalidAssociationEnd2() throws XMLStreamException, EntityProviderException {
     final String employees = "r_Employees";
     final String manager = "r_Manager";
-    final String xmlWithInvalidAssociationSetEnd = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
-        + employees
-        + "\" ToRole=\""
-        + manager
-        + "\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\""
-        + manager
-        + "\" ToRole=\""
-        + employees
-        + "\" />"
-        + "</EntityType>"
-        + "<Association Name=\""
-        + ASSOCIATION
-        + "\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\""
-        + employees
-        + "\"/>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\""
-        + manager
-        + "\"/>"
-        + "</Association>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>"
-        + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>"
-        + "<AssociationSet Name=\""
-        + ASSOCIATION
-        + "\" Association=\"RefScenario2."
-        + ASSOCIATION
-        + "\">"
-        + "<End EntitySet=\"Managers\" Role=\""
-        + manager
-        + "\"/>"
-        + "<End EntitySet=\"Managers\" Role=\""
-        + manager
-        + "\"/>"
-        + "</AssociationSet>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "</edmx:DataServices>" + "</edmx:Edmx>";
+    final String xmlWithInvalidAssociationSetEnd = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + employees + "\" ToRole=\"" + manager + "\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">" + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"" + manager + "\" ToRole=\"" + employees + "\" />" + "</EntityType>" + "<Association Name=\"" + ASSOCIATION + "\">"
+        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"" + employees + "\"/>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"" + manager + "\"/>" + "</Association>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario2." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "<End EntitySet=\"Managers\" Role=\"" + manager + "\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmlWithInvalidAssociationSetEnd);
     parser.readMetadata(reader, true);
@@ -1179,34 +560,8 @@ public class EdmParserTest {
   }
 
   @Test(expected = EntityProviderException.class)
-  public void testInvalidEntitySet() throws XMLStreamException,
-      EntityProviderException {
-    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\""
-        + propertyNames[1]
-        + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Mitarbeiter\"/>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+  public void testInvalidEntitySet() throws XMLStreamException, EntityProviderException {
+    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[1] + "\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RefScenario.Mitarbeiter\"/>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
     parser.readMetadata(reader, true);
@@ -1215,34 +570,7 @@ public class EdmParserTest {
 
   @Test
   public void testEntityTypeInOtherSchema() throws XMLStreamException, EntityProviderException {
-    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\" m:HasStream=\"true\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Photos\" EntityType=\"" + NAMESPACE2 + ".Photo\"/>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Photo\">"
-        + "<Key><PropertyRef Name=\"Id\"/></Key>"
-        + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\"/>"
-        + "</EntityType>"
-        + "</Schema>"
-        + "</edmx:DataServices>"
+    final String xmWithEntityContainer = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" m:HasStream=\"true\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Photos\" EntityType=\"" + NAMESPACE2 + ".Photo\"/>" + "</EntityContainer>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">" + "<Key><PropertyRef Name=\"Id\"/></Key>" + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\"/>" + "</EntityType>" + "</Schema>" + "</edmx:DataServices>"
         + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xmWithEntityContainer);
@@ -1260,114 +588,12 @@ public class EdmParserTest {
   }
 
   @Test
-  public void scenarioTest() throws XMLStreamException,
-      EntityProviderException {
+  public void scenarioTest() throws XMLStreamException, EntityProviderException {
     final String ASSOCIATION2 = "TeamEmployees";
-    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\""
-        + Edm.NAMESPACE_EDMX_2007_06
-        + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\""
-        + Edm.NAMESPACE_M_2007_08
-        + "\">"
-        + "<Schema Namespace=\""
-        + NAMESPACE
-        + "\" Alias=\"RS\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Employee\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\""
-        + propertyNames[0]
-        + "\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\""
-        + propertyNames[2]
-        + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>"
-        + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />"
-        + "<NavigationProperty Name=\"ne_Team\" Relationship=\"RefScenario.TeamEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Team\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
-        + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />"
-        + "</EntityType>"
-        + "<EntityType Name=\"Team\">"
-        + "<Key>"
-        + "<PropertyRef Name=\"Id\"/>"
-        + "</Key>"
-        + "<NavigationProperty Name=\"nt_Employees\" Relationship=\"RefScenario.TeamEmployees\" FromRole=\"r_Team\" ToRole=\"r_Employees\" />"
-        + "</EntityType>"
-        + "<ComplexType Name=\"c_Location\">"
-        + "<Property Name=\"Country\" Type=\"Edm.String\"/>"
-        + "</ComplexType>"
-        + "<Association Name=\""
-        + ASSOCIATION
-        + "\">"
-        + "<End Type=\"RS.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">"
-        + "<OnDelete Action=\"Cascade\"/>"
-        + "</End>"
-        + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>"
-        + "</Association>"
-        + "<Association Name=\""
-        + ASSOCIATION2
-        + "\">"
-        + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>"
-        + "<End Type=\"RefScenario.Team\" Multiplicity=\"1\" Role=\"r_Team\"/>"
-        + "</Association>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Employees\" EntityType=\"RS.Employee\"/>"
-        + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>"
-        + "<EntitySet Name=\"Teams\" EntityType=\"RefScenario.Team\"/>"
-        + "<AssociationSet Name=\""
-        + ASSOCIATION
-        + "\" Association=\"RefScenario."
-        + ASSOCIATION
-        + "\">"
-        + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>"
-        + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>"
-        + "</AssociationSet>"
-        + "<AssociationSet Name=\""
-        + ASSOCIATION2
-        + "\" Association=\"RefScenario."
-        + ASSOCIATION2
-        + "\">"
-        + "<End EntitySet=\"Teams\" Role=\"r_Team\"/>"
-        + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>"
-        + "</AssociationSet>"
-        + "</EntityContainer>"
-        + "</Schema>"
-        + "<Schema Namespace=\""
-        + NAMESPACE2
-        + "\" xmlns=\""
-        + Edm.NAMESPACE_EDM_2008_09
-        + "\">"
-        + "<EntityType Name= \"Photo\">"
-        + "<Key>"
-        + "<PropertyRef Name=\"Id\"/>"
-        + "<PropertyRef Name=\"Name\"/>"
-        + "</Key>"
-        + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\""
-        + MAX_LENGTH
-        + "\"/>"
-        + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\""
-        + DEFAULT_VALUE
-        + "\" FixedLength=\"false\"/>"
-        + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\""
-        + MIME_TYPE
-        + "\"/>"
-        + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\""
-        + FC_TARGET_PATH
-        + "\" m:FC_NsUri=\""
-        + FC_NS_URI
-        + "\""
-        + " m:FC_NsPrefix=\""
-        + FC_NS_PREFIX
-        + "\" m:FC_KeepInContent=\""
-        + FC_KEEP_IN_CONTENT
-        + "\" m:FC_ContentKind=\"text\" >"
-        + "</Property>"
-        + "</EntityType>"
-        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">"
-        + "<EntitySet Name=\"Photos\" EntityType=\"RefScenario2.Photo\"/>"
-        + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>"
-        + "</edmx:Edmx>";
+    final String xml = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" Alias=\"RS\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"" + propertyNames[0] + "\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"" + propertyNames[2] + "\" Type=\"RefScenario.c_Location\" Nullable=\"false\"/>" + "<NavigationProperty Name=\"ne_Manager\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Manager\" />" + "<NavigationProperty Name=\"ne_Team\" Relationship=\"RefScenario.TeamEmployees\" FromRole=\"r_Employees\" ToRole=\"r_Team\" />" + "</EntityType>" + "<EntityType Name=\"Manager\" BaseType=\"RefScenario.Employee\" m:HasStream=\"true\">"
+        + "<NavigationProperty Name=\"nm_Employees\" Relationship=\"RefScenario.ManagerEmployees\" FromRole=\"r_Manager\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<EntityType Name=\"Team\">" + "<Key>" + "<PropertyRef Name=\"Id\"/>" + "</Key>" + "<NavigationProperty Name=\"nt_Employees\" Relationship=\"RefScenario.TeamEmployees\" FromRole=\"r_Team\" ToRole=\"r_Employees\" />" + "</EntityType>" + "<ComplexType Name=\"c_Location\">" + "<Property Name=\"Country\" Type=\"Edm.String\"/>" + "</ComplexType>" + "<Association Name=\"" + ASSOCIATION + "\">" + "<End Type=\"RS.Employee\" Multiplicity=\"*\" Role=\"r_Employees\">" + "<OnDelete Action=\"Cascade\"/>" + "</End>" + "<End Type=\"RefScenario.Manager\" Multiplicity=\"1\" Role=\"r_Manager\"/>" + "</Association>" + "<Association Name=\"" + ASSOCIATION2 + "\">" + "<End Type=\"RefScenario.Employee\" Multiplicity=\"*\" Role=\"r_Employees\"/>" + "<End Type=\"RefScenario.Team\" Multiplicity=\"1\" Role=\"r_Team\"/>" + "</Association>"
+        + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Employees\" EntityType=\"RS.Employee\"/>" + "<EntitySet Name=\"Managers\" EntityType=\"RefScenario.Manager\"/>" + "<EntitySet Name=\"Teams\" EntityType=\"RefScenario.Team\"/>" + "<AssociationSet Name=\"" + ASSOCIATION + "\" Association=\"RefScenario." + ASSOCIATION + "\">" + "<End EntitySet=\"Managers\" Role=\"r_Manager\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "<AssociationSet Name=\"" + ASSOCIATION2 + "\" Association=\"RefScenario." + ASSOCIATION2 + "\">" + "<End EntitySet=\"Teams\" Role=\"r_Team\"/>" + "<End EntitySet=\"Employees\" Role=\"r_Employees\"/>" + "</AssociationSet>" + "</EntityContainer>" + "</Schema>" + "<Schema Namespace=\"" + NAMESPACE2 + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Photo\">" + "<Key>" + "<PropertyRef Name=\"Id\"/>" + "<PropertyRef Name=\"Name\"/>" + "</Key>"
+        + "<Property Name=\"Id\" Type=\"Edm.Int32\" Nullable=\"false\" ConcurrencyMode=\"Fixed\" MaxLength=\"" + MAX_LENGTH + "\"/>" + "<Property Name=\"Name\" Type=\"Edm.String\" Unicode=\"true\" DefaultValue=\"" + DEFAULT_VALUE + "\" FixedLength=\"false\"/>" + "<Property Name=\"BinaryData\" Type=\"Edm.Binary\" m:MimeType=\"" + MIME_TYPE + "\"/>" + "<Property Name=\"Содержание\" Type=\"Edm.String\" m:FC_TargetPath=\"" + FC_TARGET_PATH + "\" m:FC_NsUri=\"" + FC_NS_URI + "\"" + " m:FC_NsPrefix=\"" + FC_NS_PREFIX + "\" m:FC_KeepInContent=\"" + FC_KEEP_IN_CONTENT + "\" m:FC_ContentKind=\"text\" >" + "</Property>" + "</EntityType>" + "<EntityContainer Name=\"Container1\" m:IsDefaultEntityContainer=\"true\">" + "<EntitySet Name=\"Photos\" EntityType=\"RefScenario2.Photo\"/>" + "</EntityContainer>" + "</Schema>" + "</edmx:DataServices>" + "</edmx:Edmx>";
     EdmParser parser = new EdmParser();
     XMLStreamReader reader = createStreamReader(xml);
     DataServices result = parser.readMetadata(reader, true);
@@ -1406,23 +632,8 @@ public class EdmParserTest {
 
   @Test
   public void testAnnotations() throws XMLStreamException, EntityProviderException {
-    final String xmlWithAnnotations = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">"
-        + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">"
-        + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">"
-        + "<EntityType Name= \"Employee\" prefix1:href=\"http://google.de\" xmlns:prefix1=\"namespaceForAnno\">"
-        + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>"
-        + "<Property Name=\"EmployeeId\" Type=\"Edm.String\" Nullable=\"false\"/>"
-        + "<Property Name=\"EmployeeName\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\" annoPrefix:annoName=\"annoText\" xmlns:annoPrefix=\"http://annoNamespace\">"
-        + "<propertyAnnoElement>text</propertyAnnoElement>"
-        + "<propertyAnnoElement2 />"
-        + "</Property>"
-        + "</EntityType>"
-        + "<schemaElementTest1>"
-        + "<prefix:schemaElementTest2 xmlns:prefix=\"namespace\">text3"
-        + "</prefix:schemaElementTest2>"
-        + "<schemaElementTest3 rel=\"self\" pre:href=\"http://google.com\" xmlns:pre=\"namespaceForAnno\">text4</schemaElementTest3>"
-        + " </schemaElementTest1>"
-        + "</Schema>"
+    final String xmlWithAnnotations = "<edmx:Edmx Version=\"1.0\" xmlns:edmx=\"" + Edm.NAMESPACE_EDMX_2007_06 + "\">" + "<edmx:DataServices m:DataServiceVersion=\"2.0\" xmlns:m=\"" + Edm.NAMESPACE_M_2007_08 + "\">" + "<Schema Namespace=\"" + NAMESPACE + "\" xmlns=\"" + Edm.NAMESPACE_EDM_2008_09 + "\">" + "<EntityType Name= \"Employee\" prefix1:href=\"http://google.de\" xmlns:prefix1=\"namespaceForAnno\">" + "<Key><PropertyRef Name=\"EmployeeId\"/></Key>" + "<Property Name=\"EmployeeId\" Type=\"Edm.String\" Nullable=\"false\"/>" + "<Property Name=\"EmployeeName\" Type=\"Edm.String\" m:FC_TargetPath=\"SyndicationTitle\" annoPrefix:annoName=\"annoText\" xmlns:annoPrefix=\"http://annoNamespace\">" + "<propertyAnnoElement>text</propertyAnnoElement>" + "<propertyAnnoElement2 />" + "</Property>" + "</EntityType>" + "<schemaElementTest1>" + "<prefix:schemaElementTest2 xmlns:prefix=\"namespace\">text3" + "</prefix:schemaElementTest2>"
+        + "<schemaElementTest3 rel=\"self\" pre:href=\"http://google.com\" xmlns:pre=\"namespaceForAnno\">text4</schemaElementTest3>" + " </schemaElementTest1>" + "</Schema>"
 
         + "</edmx:DataServices>" + "

<TRUNCATED>

[08/22] remove @author - javadoc warning

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
index 7d1a350..3efd4b8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.api.edm.provider.ReferentialConstraintRole;
  * can be created from JPA Entity relationships.
  * </p>
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
index 7779d20..58a4a8f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.edm.provider.ReferentialConstraint;
  * to be consistent only if referential constraint role is consistent.
  * </p>
  * 
- * @author<br>
+ *  <br>
  * @DoNotImplement
  * <br>
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
index fad3b10..3e53f20 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.api.edm.provider.Schema;
  * </ol>
  * </p>
  * 
- * @author
+ *  
  *         <p>
  * @DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
index 797e76f..abe218b 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/package-info.java
@@ -20,7 +20,7 @@
  * <h3>OData JPA Processor API Library - Mapping Model</h3>
  * The JPA EDM Mapping model (XML document) is represented as JAXB annotated Java Classes.
  * 
- * @author
+ *  
  */
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.sap.com/core/odata/processor/api/jpa/model/mapping", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package org.apache.olingo.odata2.processor.api.jpa.model.mapping;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
index 365a254..75279e8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/package-info.java
@@ -21,7 +21,7 @@
  * The library provides a set of views over the JPA/EDM element containers. 
  * The views can used to access the elements that form EDM.
  * 
- * @author
+ *  
  */
 package org.apache.olingo.odata2.processor.api.jpa.model;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
index f8ca52e..4ca40de 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/package-info.java
@@ -27,7 +27,7 @@
  * <li>define a JAX-RS servlet in web.xml and configure the service factory as servlet init parameter. 
  * <p><b>See Also:</b>{@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAServiceFactory}</li></ol>
  * 
- * @author
+ *  
  */
 package org.apache.olingo.odata2.processor.api.jpa;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
index 6664faa..17ddec5 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
@@ -54,7 +54,7 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement;
 /**
  * This class contains utility methods for parsing the filter expressions built by core library from user OData Query.
  * 
- * @author
+ *  
  *
  */
 public class ODataExpressionParser {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
index a68da06..931da2b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertor.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
 /**
  * This class holds utility methods for Type conversions between JPA and OData Types.
  * 
- * @author
+ *  
  *
  */
 public class JPATypeConvertor {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
index 72a1ae8..91861a8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataCallback.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api;
 /**
  * Common OData callback interface. Every callback implementation has to implement this interface as a marker.
  * 
- * @author
+ *  
  *
  */
 public interface ODataCallback {}

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
index 06ea12b..e3e3bf4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataDebugCallback.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.odata2.api;
 
 /**
- * @author
+ *  
  *
  */
 public interface ODataDebugCallback extends ODataCallback {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
index 9ab9e1d..b7cc844 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataService.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.api.processor.part.ServiceDocumentProcessor;
 /**
  * Root interface for a custom OData service.
  * 
- * @author
+ *  
  *
  */
 public interface ODataService {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
index c63e08b..3e26faf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceFactory.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
 /**
  * Creates instance of custom OData service.
  * 
- * @author
+ *  
  */
 public abstract class ODataServiceFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
index 56c48a2..30c7fad 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ODataServiceVersion.java
@@ -23,7 +23,7 @@ import java.util.regex.Pattern;
 
 /**
  * This class is a container for the supported ODataServiceVersions.
- * @author
+ *  
  *
  */
 public class ODataServiceVersion {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
index a2cb930..23584f3 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchHandler.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.processor.ODataRequest;
 import org.apache.olingo.odata2.api.processor.ODataResponse;
 
 /**
- * @author
+ *  
  */
 public interface BatchHandler {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchPart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchPart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchPart.java
index 650ecdc..b7d8539 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchPart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchPart.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.processor.ODataRequest;
 /**
  * A BatchPart
  * <p> BatchPart represents a distinct MIME part of a Batch Request body. It can be ChangeSet or Query Operation
- * @author
+ *  
  */
 public interface BatchPart {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
index 5629af6..b75a797 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/batch/BatchResponsePart.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
 /**
 * A BatchResponsePart
 * <p> BatchResponsePart represents a distinct part of a Batch Response body. It can be a ChangeSet response or a response to a retrieve request
-* @author
+*  
 */
 public abstract class BatchResponsePart {
 
@@ -68,7 +68,7 @@ public abstract class BatchResponsePart {
 
   /**
    * Implementation of the builder pattern to create instances of this type of object. 
-   * @author
+   *  
    */
   public static abstract class BatchResponsePartBuilder {
     public abstract BatchResponsePart build();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
index e75dfd4..fbf788c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpContentType.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.commons;
 /**
  * Constants for <code>Http Content Type</code> definitions as specified in 
  * <a href="http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html">RFC 2616 Section 14</a>.
- * @author
+ *  
  */
 public interface HttpContentType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
index fd63043..6c098e8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpHeaders.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * HTTP header constants
- * @author
+ *  
  *
  */
 public interface HttpHeaders {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
index e63caa4..267e69b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/HttpStatusCodes.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.commons;
 /**
  * HTTP status codes as defined in RFC2616-sec10
  * and additional status codes as defined in RFC6585
- * @author
+ *  
  */
 public enum HttpStatusCodes {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
index f624f8c..f2b0ecf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/InlineCount.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * Inlinecount constants as described in the OData protocol
- * @author
+ *  
  */
 public enum InlineCount {
   ALLPAGES, NONE;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
index b459e18..10e8d5b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpHeaders.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * HTTP header constants as used in the OData protocol
- * @author
+ *  
  */
 public class ODataHttpHeaders {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
index 4acf762..d583fd5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/commons/ODataHttpMethod.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.commons;
 
 /**
  * The supported HTTP methods.
- * @author
+ *  
  */
 public enum ODataHttpMethod {
   GET, PUT, POST, DELETE, PATCH, MERGE;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
index 4725755..ef9652e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/Edm.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * Entity Data Model (EDM)
  * <p>Interface representing a Entity Data Model as described in the Conceptual Schema Definition.
- * @author
+ *  
  */
 public interface Edm {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
index 9f20e5c..180bd6f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAction.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * A CSDL Action Element
  * <p>EdmAction can either be Cascade or None. Cascade implies that a delete operation on an entity also should delete the relationship instances.
- * @author
+ *  
  */
 public enum EdmAction {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
index 4c8643a..186494a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotatable.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmAnnotatable can be applied to CSDL elements as described in the Conceptual Schema Definition Language.
- * @author
+ *  
  */
 public interface EdmAnnotatable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
index 2c50ede..7c2778d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationAttribute.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * A CSDL AnnotationAttribute element. 
  * <p>EdmAnnotationAttribute is a custom XML attribute which can be applied to a CSDL element.
- * @author
+ *  
  */
 public interface EdmAnnotationAttribute {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
index 75cf042..a4e33ef 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotationElement.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.edm.provider.AnnotationElement;
  * @org.apache.olingo.odata2.DoNotImplement
  * A CSDL AnnotationElement element
  * <p>EdmAnnotationElement is a custom XML element which can be applied to a CSDL element. 
- * @author
+ *  
  */
 public interface EdmAnnotationElement {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
index 63ee197..1fd61ef 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAnnotations.java
@@ -23,7 +23,7 @@ import java.util.List;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmAnnotations holds all annotation attributes and elements for a specific CSDL element.
- * @author
+ *  
  */
 public interface EdmAnnotations {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
index e6d7603..abeccbf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociation.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
  * A CSDL Association element
  * 
  * <p>EdmAssociation defines the relationship of two entity types. 
- * @author
+ *  
  */
 public interface EdmAssociation extends EdmType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
index 79252f6..43dc3d9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationEnd.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
  * A CSDL AssociationEnd element
  * 
  * <p>EdmAssociationEnd defines one side of the relationship of two entity types.
- * @author
+ *  
  */
 public interface EdmAssociationEnd {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
index 609bbac..07a173f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSet.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
  * A CSDL AssociationSet element
  * 
  * <p>EdmAssociationSet defines the relationship of two entity sets.
- * @author
+ *  
  */
 public interface EdmAssociationSet extends EdmNamed {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
index 28f19be..87c7f26 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmAssociationSetEnd.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
  * A CSDL AssociationSetEnd element
  * 
  * <p>EdmAssociationSetEnd defines one side of the relationship of two entity sets.
- * @author
+ *  
  */
 public interface EdmAssociationSetEnd {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
index b926721..d00268f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmComplexType.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * <p>A CSDL ComplexType element.</p>
  * <p>EdmComplexType holds a set of related information like {@link EdmSimpleType}
  * properties and EdmComplexType properties.
- * @author
+ *  
  * @org.apache.olingo.odata2.DoNotImplement
  */
 public interface EdmComplexType extends EdmStructuralType {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
index 33268f0..307d84f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmConcurrencyMode.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmConcurrencyMode can be applied to any primitive Entity Data Model (EDM) type.
  * <p>Possible values are "None", which is the default, and "Fixed". Fixed implies that the property should be used for optimistic concurrency checks.
- * @author
+ *  
  */
 public enum EdmConcurrencyMode {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
index 92bd562..c1027c5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmContentKind.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
  * EdmContentType is used for Feed Customization.
  * <p>It specifies the content type of the value of the property being mapped via a customizable feed mapping.
  * This value can be "text", "html" or "xhtml". 
- * @author
+ *  
  */
 public enum EdmContentKind {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
index d5cf3a0..87ed5f5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmCustomizableFeedMappings.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * Customizable Feed property mappings for the AtomPub Format as defined in the OData specification.
- * @author
+ *  
  */
 public interface EdmCustomizableFeedMappings {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
index 2d5bd96..dcd7c49 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmElement.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmElement is the base interface for {@link EdmParameter} and {@link EdmProperty} and provides
  * the information by which facets further specialize the usage of the type.
- * @author
+ *  
  */
 public interface EdmElement extends EdmMappable, EdmTyped {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
index 31c23aa..4f44aa8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityContainer.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
  * A CSDL EntityContainer element
  * 
  * <p>EdmEntityContainer hold the information of EntitySets, FunctionImports and AssociationSets contained
- * @author
+ *  
  */
 public interface EdmEntityContainer extends EdmNamed {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
index 6dc00de..d97edaf 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySet.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * A CSDL EntitySet element
  * <p>EdmEntitySet is the container for entity type instances as described in the OData protocol. 
- * @author
+ *  
  */
 public interface EdmEntitySet extends EdmMappable, EdmNamed {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
index ed44e1d..0913e98 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntitySetInfo.java
@@ -23,7 +23,7 @@ import java.net.URI;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * Objects of this class contain information about one entity set inside the EntityDataModel.
- * @author
+ *  
  *
  */
 public interface EdmEntitySetInfo {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
index ec51497..92abe01 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmEntityType.java
@@ -26,7 +26,7 @@ import java.util.List;
  * properties and {@link EdmComplexType} properties and in addition to a
  * {@link EdmComplexType complex type} it provides information about key properties,
  * customizable feed mappings and {@link EdmNavigationProperty navigation properties}. 
- * @author
+ *  
  * @org.apache.olingo.odata2.DoNotImplement
  */
 public interface EdmEntityType extends EdmStructuralType {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
index 1134a86..4b60e04 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmException.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * An exception for problems regarding the Entity Data Model.
- * @author
+ *  
  */
 public class EdmException extends ODataMessageException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
index 315b122..6cb1ad8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFacets.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * <p>A Facet is an element defined in CSDL that provides information
  * that specializes the usage of a type.</p>
- * @author
+ *  
  */
 public interface EdmFacets {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
index d0140fa..d94b53d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmFunctionImport.java
@@ -30,7 +30,7 @@ import java.util.Collection;
  * <li>{@link EdmSimpleType} or a collection of simple types
  * <li>{@link EdmEntityType} or a collection of entity types
  * <li>{@link EdmEntitySet}
- * @author
+ *  
  */
 public interface EdmFunctionImport extends EdmMappable, EdmNamed {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
index 930f4b6..f600e1e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteral.java
@@ -27,7 +27,7 @@ package org.apache.olingo.odata2.api.edm;
  * is stored here separately, the default representation is more appropriate.
  * Should the URI representation be needed, it can be re-created by calling
  * {@link EdmSimpleType#toUriLiteral}.</p>
- * @author
+ *  
  * @see EdmLiteralKind
  */
 public final class EdmLiteral {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
index 230bb89..42a12c2 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralException.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * Exception for violation of the OData URI construction rules, resulting in a 400 Bad Request response
- * @author
+ *  
  */
 public class EdmLiteralException extends EdmException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
index 5c29501..d477f02 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmLiteralKind.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmLiteralKind indicates the format of an EDM literal.
- * @author
+ *  
  */
 public enum EdmLiteralKind {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
index 6edc757..975a240 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMappable.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmMappable can be applied to CSDL elements to associate additional information.
- * @author
+ *  
  */
 public interface EdmMappable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
index a0b8709..3d605c7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMapping.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmMapping holds custom mapping information which can be applied to a CSDL element.
- * @author
+ *  
  */
 public interface EdmMapping {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
index 6dbb732..c450454 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmMultiplicity.java
@@ -27,7 +27,7 @@ package org.apache.olingo.odata2.api.edm;
  * <dt>   1</dt><dd>exactly one</dd>
  * <dt>   *</dt><dd>many</dd>
  * </dl></p> 
- * @author
+ *  
  */
 public enum EdmMultiplicity {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
index 5dcb894..2066aca 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNamed.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmName is the base interface for nearly all CSDL constructs.
- * @author
+ *  
  */
 public interface EdmNamed {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
index 6a4b218..6f50183 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmNavigationProperty.java
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.api.edm;
  * A CSDL NavigationProperty element
  * 
  * <p>EdmNavigationProperty allows navigation from one entity type to another via a relationship.
- * @author
+ *  
  */
 public interface EdmNavigationProperty extends EdmTyped, EdmMappable {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
index 7d8d4e0..951a170 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmParameter.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * @org.apache.olingo.odata2.DoNotImplement
  * A CSDL FunctionImportParameter element
  * <p>EdmParameter defines a function import parameter (which is used as input parameter). FunctionImports are described in {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport} or in the OData protocol.
- * @author
+ *  
  */
 public interface EdmParameter extends EdmElement {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
index f86acd7..6ec3954 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmProperty.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.api.edm;
  * A CSDL Property element
  * <p>EdmProperty defines a simple type or a complex type.
  * @org.apache.olingo.odata2.DoNotImplement
- * @author
+ *  
  */
 public interface EdmProperty extends EdmElement {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
index 134165f..195e784 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmServiceMetadata.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * This interface gives access to the metadata of a service, the calculated Data Service Version and an info list of all entity sets inside this EntityDataModel.
- * @author
+ *  
  *
  */
 public interface EdmServiceMetadata {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
index edd2097..53500e0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleType.java
@@ -78,7 +78,7 @@ package org.apache.olingo.odata2.api.edm;
  * </tbody>
  * </table></p>
  * </p>
- * @author
+ *  
  * @org.apache.olingo.odata2.DoNotImplement
  */
 public interface EdmSimpleType extends EdmType {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
index c262e1a..ce756c8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeException.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * Exception for parsing errors with {@link EdmSimpleType}s
- * @author
+ *  
  */
 public class EdmSimpleTypeException extends EdmException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
index d6c4809..8c170af 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeFacade.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * This facade is used as a hook into the core implementation.
- * @author
+ *  
  */
 public interface EdmSimpleTypeFacade {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
index 4c20b35..6e70c6a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmSimpleTypeKind.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmSimpleTypeKind holds all EdmSimpleTypes defined as primitive type in the Entity Data Model (EDM).
- * @author
+ *  
  */
 public enum EdmSimpleTypeKind {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
index 6fa283c..ba1f4c4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmStructuralType.java
@@ -24,7 +24,7 @@ import java.util.List;
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmStructuralType is the base for a complex type or an entity type.
  * <p>Complex types and entity types are described in the Conceptual Schema Definition of the OData protocol.
- * @author
+ *  
  */
 public interface EdmStructuralType extends EdmMappable, EdmType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
index 47f7f9d..8af4d5a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTargetPath.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmTargetPath specifies the possible default targets for an EDM property which is mapped to an atom element.
- * @author
+ *  
  */
 public class EdmTargetPath {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
index 386df0a..77f39c4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmType.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmType holds the namespace of a given type and its type as {@link EdmTypeKind}.
- * @author
+ *  
  */
 public interface EdmType extends EdmNamed {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
index 3df347f..6b7d6d8 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTypeKind.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmTypeKind specifies the type of an EDM element.
- * @author
+ *  
  */
 public enum EdmTypeKind {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
index 348cf34..c39e4a9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/EdmTyped.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * EdmTyped indicates if an EDM element is of a special type and holds the multiplicity of that type.
- * @author
+ *  
  */
 public interface EdmTyped extends EdmNamed {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
index 8423685..ffb345e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/FullQualifiedName.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.api.edm;
 /**
  * @org.apache.olingo.odata2.DoNotImplement
  * A full qualified name of any element in the EDM consists of a name and a namespace.
- * @author
+ *  
  */
 public class FullQualifiedName {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
index fd86ac8..ec4482f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationAttribute.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.edm.EdmAnnotationAttribute;
 
 /**
  * Objects of this class represent an annotation attribute
- * @author
+ *  
  */
 public class AnnotationAttribute implements EdmAnnotationAttribute {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
index 164a444..50c2ab0 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AnnotationElement.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmAnnotationElement;
 
 /**
  * Objects of this class represent an annotation element.
- * @author
+ *  
  */
 public class AnnotationElement implements EdmAnnotationElement {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
index 99aa682..72bbeb4 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Association.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent an association
- * @author
+ *  
  */
 public class Association {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
index a2ee407..cffa7a1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationEnd.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this class represent an association end
- * @author
+ *  
  */
 public class AssociationEnd {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
index d0afc0b..7de7204 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSet.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this class represent an association set
- * @author
+ *  
  */
 public class AssociationSet {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
index 5641b91..ad9d845 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/AssociationSetEnd.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent an association set end
- * @author
+ *  
  */
 public class AssociationSetEnd {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
index 2300a6e..095d70a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexProperty.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this class represent a complex property.
- * @author
+ *  
  */
 public class ComplexProperty extends Property {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
index 2ec9651..73c52df 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ComplexType.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this class represent a complex type
- * @author
+ *  
  */
 public class ComplexType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
index d340abe..e3d7d31 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/CustomizableFeedMappings.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.edm.EdmCustomizableFeedMappings;
 
 /**
  * Objects of this class represent customizable feed mappings.
- * @author
+ *  
  */
 public class CustomizableFeedMappings implements EdmCustomizableFeedMappings {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
index c106d3a..281505c 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/DataServices.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent the data service. They contain all schemas of the EDM as well as the dataServiceVersion
- * @author
+ *  
  */
 public class DataServices {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
index 2836b4a..9f62f29 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Documentation.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent documentation
- * @author
+ *  
  */
 public class Documentation {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
index 99c4d4c..4b4ccf1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProvider.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.exception.ODataNotImplementedException;
 
 /**
  * Default EDM Provider which is to be extended by the application
- * @author
+ *  
  *
  */
 public abstract class EdmProvider {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
index 0a586a8..d4ea27f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderAccessor.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.api.edm.provider;
 
 /**
  * This interface can be used to access the {@link EdmProvider} within an application. 
- * @author
+ *  
  *
  */
 public interface EdmProviderAccessor {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
index cc11a14..badb6ae 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EdmProviderFactory.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
 
 /**
  * EDM Provider Factory which can be used to create an edm provider (e.g. from a metadata document)
- * @author
+ *  
  *
  */
 public class EdmProviderFactory {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
index 8ce6a77..ae74bb9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainer.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent an entity container including its child elements
- * @author
+ *  
  */
 public class EntityContainer extends EntityContainerInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
index b5a1232..fdcb4ac 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityContainerInfo.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent an entity container
- * @author
+ *  
  */
 public class EntityContainerInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
index 7f29794..a9c5c2b 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntitySet.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this class represent an entity set
- * @author
+ *  
  */
 public class EntitySet {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
index fbb0642..23907f9 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/EntityType.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this class represent an entity type
- * @author
+ *  
  */
 public class EntityType extends ComplexType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
index 7c66a6b..7e3db68 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Facets.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmFacets;
 
 /**
  * Objects of this class represent the facets an entity type, property or function import can have
- * @author
+ *  
  */
 public class Facets implements EdmFacets {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
index af801ce..c16882a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImport.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent a function import
- * @author
+ *  
  */
 public class FunctionImport {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
index f8644da..e9c22f7 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/FunctionImportParameter.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
 
 /**
  * Objects of this class represent function import parameters
- * @author
+ *  
  */
 public class FunctionImportParameter {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
index 4fc982a..3688ccb 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Key.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent a key for an entity type
- * @author
+ *  
  */
 public class Key {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
index 15b3732..cc6e555 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Mapping.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.edm.EdmMapping;
 
 /**
  * Object of this class represent the mapping of a value to a MIME type.
- * @author
+ *  
  */
 public class Mapping implements EdmMapping {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
index 2378946..3b2f45e 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/NavigationProperty.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this Class represent a navigation property
- * @author
+ *  
  */
 public class NavigationProperty {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
index ee15ed1..29ab475 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/OnDelete.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmAction;
 
 /**
  * Objects of this class represent an OnDelete Action
- * @author
+ *  
  */
 public class OnDelete {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
index 34efc62..b5ee9f1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Property.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.edm.EdmFacets;
 
 /**
  * Objects of this class represent a property of an entity type
- * @author
+ *  
  */
 public abstract class Property {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
index 7944d53..890ff91 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/PropertyRef.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent a reference to a property via its name
- * @author
+ *  
  *
  */
 public class PropertyRef {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
index b00711c..ec54d68 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraint.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this Class represent a referential constraint
- * @author
+ *  
  */
 public class ReferentialConstraint {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
index ea369a7..1cd57e5 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReferentialConstraintRole.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this Class represent a referential constraint role
- * @author
+ *  
  */
 public class ReferentialConstraintRole {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
index 8d2ffad..988d14d 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/ReturnType.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 
 /**
  * Objects of this Class represent a return type of a function import
- * @author
+ *  
  */
 public class ReturnType {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
index 628b259..62dacc1 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Schema.java
@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * Objects of this class represent a schema
- * @author
+ *  
  */
 public class Schema {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
index ba4cd10..e902200 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/SimpleProperty.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
 
 /**
  * Objects of this class represent a simple property.
- * @author
+ *  
  */
 public class SimpleProperty extends Property {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
index 3bb3e18..a73da12 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/edm/provider/Using.java
@@ -22,7 +22,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * @author
+ *  
  */
 public class Using {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
index 5d863a1..97cc26a 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProvider.java
@@ -44,7 +44,7 @@ import org.apache.olingo.odata2.api.servicedocument.ServiceDocument;
  * Therefore this library provides (in its <code>core</code> packages) as convenience
  * basic entity providers for accessing entities in the <b>XML</b> and <b>JSON</b>
  * formats.</p>
- * @author
+ *  
  */
 public final class EntityProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
index c3c6359..46d5362 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderBatchProperties.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.uri.PathInfo;
 /**
  * The {@link EntityProviderBatchProperties} contains necessary informations to parse a Batch Request body.
  * 
- * @author
+ *  
  */
 public class EntityProviderBatchProperties {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
index 1aa0801..f64aa93 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/EntityProviderReadProperties.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.ep.callback.OnReadInlineContent;
  * <li>and the <code>type mappings</code></li>
  * </ul>
  * 
- * @author
+ *  
  */
 public class EntityProviderReadProperties {
   /** Callback which is necessary if entity contains inlined navigation properties. */
@@ -83,7 +83,7 @@ public class EntityProviderReadProperties {
   }
 
   /**
-   * @author
+   *  
    */
   public static class EntityProviderReadPropertiesBuilder {
     private final EntityProviderReadProperties properties = new EntityProviderReadProperties();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
----------------------------------------------------------------------
diff --git a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
index 4579f26..fb4319f 100644
--- a/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
+++ b/odata-api/src/main/java/org/apache/olingo/odata2/api/ep/callback/OnReadInlineContent.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.exception.ODataApplicationException;
  * <code>navigationPropertyName</code> and a <code>NULL</code> entry set.
  * </p>
  * 
- * @author
+ *  
  */
 public interface OnReadInlineContent {
 


[19/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
index c4768fe..c84687f 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectContext.java
@@ -36,8 +36,7 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLJoinContextView;
 import org.apache.olingo.odata2.processor.core.jpa.ODataExpressionParser;
 
-public class JPQLJoinSelectContext extends JPQLSelectContext implements
-    JPQLJoinContextView {
+public class JPQLJoinSelectContext extends JPQLSelectContext implements JPQLJoinContextView {
 
   private List<JPAJoinClause> jpaJoinClauses = null;
 
@@ -54,8 +53,7 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements
     protected int relationShipAliasCounter = 0;
 
     @Override
-    public JPQLContext build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public JPQLContext build() throws ODataJPAModelException, ODataJPARuntimeException {
       try {
 
         if (JPQLJoinSelectContext.this.isCountOnly) {
@@ -67,12 +65,9 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements
         setJPAOuterJoinClause(generateJoinClauses());
 
         if (!jpaJoinClauses.isEmpty()) {
-          JPAJoinClause joinClause = jpaJoinClauses
-              .get(jpaJoinClauses.size() - 1);
-          setJPAEntityName(joinClause
-              .getEntityName());
-          setJPAEntityAlias(joinClause
-              .getEntityRelationShipAlias());
+          JPAJoinClause joinClause = jpaJoinClauses.get(jpaJoinClauses.size() - 1);
+          setJPAEntityName(joinClause.getEntityName());
+          setJPAEntityAlias(joinClause.getEntityRelationShipAlias());
         }
 
         setOrderByCollection(generateOrderByFileds());
@@ -82,26 +77,21 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements
         setWhereExpression(generateWhereExpression());
 
       } catch (ODataException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.INNER_EXCEPTION, e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
       }
 
       return JPQLJoinSelectContext.this;
     }
 
-    protected List<JPAJoinClause> generateJoinClauses()
-        throws ODataJPARuntimeException, EdmException {
+    protected List<JPAJoinClause> generateJoinClauses() throws ODataJPARuntimeException, EdmException {
 
       List<JPAJoinClause> jpaOuterJoinClauses = new ArrayList<JPAJoinClause>();
       JPAJoinClause jpaOuterJoinClause = null;
       String joinCondition = null;
       String entityAlias = generateJPAEntityAlias();
-      joinCondition = ODataExpressionParser.parseKeyPredicates(
-          entitySetView.getKeyPredicates(),
-          entityAlias);
+      joinCondition = ODataExpressionParser.parseKeyPredicates(entitySetView.getKeyPredicates(), entityAlias);
 
-      EdmEntityType entityType = entitySetView.getStartEntitySet()
-          .getEntityType();
+      EdmEntityType entityType = entitySetView.getStartEntitySet().getEntityType();
       Mapping mapping = (Mapping) entityType.getMapping();
       String entityTypeName = null;
       if (mapping != null) {
@@ -110,33 +100,19 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements
         entityTypeName = entityType.getName();
       }
 
-      jpaOuterJoinClause = new JPAJoinClause(
-          entityTypeName,
-          entityAlias,
-          null,
-          null, joinCondition,
-          JPAJoinClause.JOIN.INNER);
+      jpaOuterJoinClause = new JPAJoinClause(entityTypeName, entityAlias, null, null, joinCondition, JPAJoinClause.JOIN.INNER);
 
       jpaOuterJoinClauses.add(jpaOuterJoinClause);
 
-      for (NavigationSegment navigationSegment : entitySetView
-          .getNavigationSegments()) {
+      for (NavigationSegment navigationSegment : entitySetView.getNavigationSegments()) {
 
-        EdmNavigationProperty navigationProperty = navigationSegment
-            .getNavigationProperty();
+        EdmNavigationProperty navigationProperty = navigationSegment.getNavigationProperty();
 
         String relationShipAlias = generateRelationShipAlias();
 
-        joinCondition = ODataExpressionParser.parseKeyPredicates(
-            navigationSegment.getKeyPredicates(),
-            relationShipAlias);
+        joinCondition = ODataExpressionParser.parseKeyPredicates(navigationSegment.getKeyPredicates(), relationShipAlias);
 
-        jpaOuterJoinClause = new JPAJoinClause(
-            getFromEntityName(navigationProperty),
-            entityAlias,
-            getRelationShipName(navigationProperty),
-            relationShipAlias, joinCondition,
-            JPAJoinClause.JOIN.INNER);
+        jpaOuterJoinClause = new JPAJoinClause(getFromEntityName(navigationProperty), entityAlias, getRelationShipName(navigationProperty), relationShipAlias, joinCondition, JPAJoinClause.JOIN.INNER);
 
         jpaOuterJoinClauses.add(jpaOuterJoinClause);
 
@@ -145,13 +121,11 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements
       return jpaOuterJoinClauses;
     }
 
-    private String getFromEntityName(
-        final EdmNavigationProperty navigationProperty) throws EdmException {
+    private String getFromEntityName(final EdmNavigationProperty navigationProperty) throws EdmException {
 
       String fromRole = navigationProperty.getFromRole();
 
-      EdmEntityType toEntityType = navigationProperty.getRelationship()
-          .getEnd(fromRole).getEntityType();
+      EdmEntityType toEntityType = navigationProperty.getRelationship().getEnd(fromRole).getEntityType();
 
       EdmMapping mapping = toEntityType.getMapping();
 
@@ -166,8 +140,7 @@ public class JPQLJoinSelectContext extends JPQLSelectContext implements
 
     }
 
-    private String getRelationShipName(
-        final EdmNavigationProperty navigationProperty) throws EdmException {
+    private String getRelationShipName(final EdmNavigationProperty navigationProperty) throws EdmException {
 
       EdmMapping mapping = navigationProperty.getMapping();
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
index 3f504c1..bb385ca 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleContext.java
@@ -35,8 +35,7 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLJoinSelectSingleContextView;
 import org.apache.olingo.odata2.processor.core.jpa.ODataExpressionParser;
 
-public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext
-    implements JPQLJoinSelectSingleContextView {
+public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext implements JPQLJoinSelectSingleContextView {
 
   private List<JPAJoinClause> jpaJoinClauses = null;
 
@@ -44,51 +43,42 @@ public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext
     this.jpaJoinClauses = jpaJoinClauses;
   }
 
-  public class JPQLJoinSelectSingleContextBuilder extends
-      JPQLSelectSingleContextBuilder {
+  public class JPQLJoinSelectSingleContextBuilder extends JPQLSelectSingleContextBuilder {
 
     protected int relationShipAliasCounter = 0;
 
     @Override
-    public JPQLContext build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public JPQLContext build() throws ODataJPAModelException, ODataJPARuntimeException {
       try {
         setType(JPQLContextType.JOIN_SINGLE);
         setJPAJoinClause(generateJoinClauses());
 
         if (!jpaJoinClauses.isEmpty()) {
-          JPAJoinClause joinClause = jpaJoinClauses
-              .get(jpaJoinClauses.size() - 1);
+          JPAJoinClause joinClause = jpaJoinClauses.get(jpaJoinClauses.size() - 1);
           setJPAEntityName(joinClause.getEntityName());
-          setJPAEntityAlias(joinClause
-              .getEntityRelationShipAlias());
+          setJPAEntityAlias(joinClause.getEntityRelationShipAlias());
         }
 
-        setKeyPredicates(entityView
-            .getKeyPredicates());
+        setKeyPredicates(entityView.getKeyPredicates());
 
         setSelectExpression(generateSelectExpression());
 
       } catch (EdmException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL, e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
       }
 
       return JPQLJoinSelectSingleContext.this;
     }
 
-    protected List<JPAJoinClause> generateJoinClauses()
-        throws ODataJPARuntimeException, EdmException {
+    protected List<JPAJoinClause> generateJoinClauses() throws ODataJPARuntimeException, EdmException {
 
       List<JPAJoinClause> jpaOuterJoinClauses = new ArrayList<JPAJoinClause>();
       JPAJoinClause jpaOuterJoinClause = null;
       String joinCondition = null;
       String entityAlias = generateJPAEntityAlias();
-      joinCondition = ODataExpressionParser.parseKeyPredicates(
-          entityView.getKeyPredicates(), entityAlias);
+      joinCondition = ODataExpressionParser.parseKeyPredicates(entityView.getKeyPredicates(), entityAlias);
 
-      EdmEntityType entityType = entityView.getStartEntitySet()
-          .getEntityType();
+      EdmEntityType entityType = entityView.getStartEntitySet().getEntityType();
       Mapping mapping = (Mapping) entityType.getMapping();
       String entityTypeName = null;
       if (mapping != null) {
@@ -97,29 +87,19 @@ public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext
         entityTypeName = entityType.getName();
       }
 
-      jpaOuterJoinClause = new JPAJoinClause(entityTypeName, entityAlias,
-          null, null, joinCondition, JPAJoinClause.JOIN.INNER);
+      jpaOuterJoinClause = new JPAJoinClause(entityTypeName, entityAlias, null, null, joinCondition, JPAJoinClause.JOIN.INNER);
 
       jpaOuterJoinClauses.add(jpaOuterJoinClause);
 
-      for (NavigationSegment navigationSegment : entityView
-          .getNavigationSegments()) {
+      for (NavigationSegment navigationSegment : entityView.getNavigationSegments()) {
 
-        EdmNavigationProperty navigationProperty = navigationSegment
-            .getNavigationProperty();
+        EdmNavigationProperty navigationProperty = navigationSegment.getNavigationProperty();
 
         String relationShipAlias = generateRelationShipAlias();
 
-        joinCondition = ODataExpressionParser
-            .parseKeyPredicates(
-                navigationSegment.getKeyPredicates(),
-                relationShipAlias);
+        joinCondition = ODataExpressionParser.parseKeyPredicates(navigationSegment.getKeyPredicates(), relationShipAlias);
 
-        jpaOuterJoinClause = new JPAJoinClause(
-            getFromEntityName(navigationProperty), entityAlias,
-            getRelationShipName(navigationProperty),
-            relationShipAlias, joinCondition,
-            JPAJoinClause.JOIN.INNER);
+        jpaOuterJoinClause = new JPAJoinClause(getFromEntityName(navigationProperty), entityAlias, getRelationShipName(navigationProperty), relationShipAlias, joinCondition, JPAJoinClause.JOIN.INNER);
 
         jpaOuterJoinClauses.add(jpaOuterJoinClause);
 
@@ -128,13 +108,11 @@ public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext
       return jpaOuterJoinClauses;
     }
 
-    private String getFromEntityName(
-        final EdmNavigationProperty navigationProperty) throws EdmException {
+    private String getFromEntityName(final EdmNavigationProperty navigationProperty) throws EdmException {
 
       String fromRole = navigationProperty.getFromRole();
 
-      EdmEntityType fromEntityType = navigationProperty.getRelationship()
-          .getEnd(fromRole).getEntityType();
+      EdmEntityType fromEntityType = navigationProperty.getRelationship().getEnd(fromRole).getEntityType();
 
       EdmMapping mapping = fromEntityType.getMapping();
 
@@ -149,8 +127,7 @@ public class JPQLJoinSelectSingleContext extends JPQLSelectSingleContext
 
     }
 
-    private String getRelationShipName(
-        final EdmNavigationProperty navigationProperty) throws EdmException {
+    private String getRelationShipName(final EdmNavigationProperty navigationProperty) throws EdmException {
 
       EdmMapping mapping = navigationProperty.getMapping();
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
index 1e7d6f0..41282de 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinSelectSingleStatementBuilder.java
@@ -48,14 +48,11 @@ public class JPQLJoinSelectSingleStatementBuilder extends JPQLStatementBuilder {
     StringBuilder jpqlQuery = new StringBuilder();
     StringBuilder joinWhereCondition = null;
 
-    jpqlQuery.append(JPQLStatement.KEYWORD.SELECT).append(
-        JPQLStatement.DELIMITER.SPACE);
+    jpqlQuery.append(JPQLStatement.KEYWORD.SELECT).append(JPQLStatement.DELIMITER.SPACE);
     jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
-    jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(
-        JPQLStatement.DELIMITER.SPACE);
+    jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(JPQLStatement.DELIMITER.SPACE);
 
-    if (context.getJPAJoinClauses() != null
-        && context.getJPAJoinClauses().size() > 0) {
+    if (context.getJPAJoinClauses() != null && context.getJPAJoinClauses().size() > 0) {
       List<JPAJoinClause> joinClauseList = context.getJPAJoinClauses();
       JPAJoinClause joinClause = joinClauseList.get(0);
       String joinCondition = joinClause.getJoinCondition();
@@ -65,8 +62,7 @@ public class JPQLJoinSelectSingleStatementBuilder extends JPQLStatementBuilder {
       }
       String relationShipAlias = null;
       joinClause = joinClauseList.get(1);
-      jpqlQuery.append(joinClause.getEntityName()).append(
-          JPQLStatement.DELIMITER.SPACE);
+      jpqlQuery.append(joinClause.getEntityName()).append(JPQLStatement.DELIMITER.SPACE);
       jpqlQuery.append(joinClause.getEntityAlias());
 
       int i = 1;
@@ -74,14 +70,11 @@ public class JPQLJoinSelectSingleStatementBuilder extends JPQLStatementBuilder {
       relationShipAlias = joinClause.getEntityAlias();
       while (i < limit) {
         jpqlQuery.append(JPQLStatement.DELIMITER.SPACE);
-        jpqlQuery.append(JPQLStatement.KEYWORD.JOIN).append(
-            JPQLStatement.DELIMITER.SPACE);
+        jpqlQuery.append(JPQLStatement.KEYWORD.JOIN).append(JPQLStatement.DELIMITER.SPACE);
 
         joinClause = joinClauseList.get(i);
-        jpqlQuery.append(relationShipAlias).append(
-            JPQLStatement.DELIMITER.PERIOD);
-        jpqlQuery.append(joinClause.getEntityRelationShip()).append(
-            JPQLStatement.DELIMITER.SPACE);
+        jpqlQuery.append(relationShipAlias).append(JPQLStatement.DELIMITER.PERIOD);
+        jpqlQuery.append(joinClause.getEntityRelationShip()).append(JPQLStatement.DELIMITER.SPACE);
         jpqlQuery.append(joinClause.getEntityRelationShipAlias());
 
         relationShipAlias = joinClause.getEntityRelationShipAlias();
@@ -89,17 +82,14 @@ public class JPQLJoinSelectSingleStatementBuilder extends JPQLStatementBuilder {
 
         joinCondition = joinClause.getJoinCondition();
         if (joinCondition != null) {
-          joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE
-              + JPQLStatement.Operator.AND
-              + JPQLStatement.DELIMITER.SPACE);
+          joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND + JPQLStatement.DELIMITER.SPACE);
 
           joinWhereCondition.append(joinCondition);
         }
 
       }
     } else {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.JOIN_CLAUSE_EXPECTED, null);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.JOIN_CLAUSE_EXPECTED, null);
     }
 
     if (joinWhereCondition.length() > 0) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
index 336dd9b..afd09bf 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLJoinStatementBuilder.java
@@ -61,11 +61,9 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
       jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
     }
 
-    jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(
-        JPQLStatement.DELIMITER.SPACE);
+    jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(JPQLStatement.DELIMITER.SPACE);
 
-    if (context.getJPAJoinClauses() != null
-        && context.getJPAJoinClauses().size() > 0) {
+    if (context.getJPAJoinClauses() != null && context.getJPAJoinClauses().size() > 0) {
       List<JPAJoinClause> joinClauseList = context.getJPAJoinClauses();
       JPAJoinClause joinClause = joinClauseList.get(0);
       String joinCondition = joinClause.getJoinCondition();
@@ -75,8 +73,7 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
       }
       String relationShipAlias = null;
       joinClause = joinClauseList.get(1);
-      jpqlQuery.append(joinClause.getEntityName()).append(
-          JPQLStatement.DELIMITER.SPACE);
+      jpqlQuery.append(joinClause.getEntityName()).append(JPQLStatement.DELIMITER.SPACE);
       jpqlQuery.append(joinClause.getEntityAlias());
 
       int i = 1;
@@ -84,14 +81,11 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
       relationShipAlias = joinClause.getEntityAlias();
       while (i < limit) {
         jpqlQuery.append(JPQLStatement.DELIMITER.SPACE);
-        jpqlQuery.append(JPQLStatement.KEYWORD.JOIN).append(
-            JPQLStatement.DELIMITER.SPACE);
+        jpqlQuery.append(JPQLStatement.KEYWORD.JOIN).append(JPQLStatement.DELIMITER.SPACE);
 
         joinClause = joinClauseList.get(i);
-        jpqlQuery.append(relationShipAlias).append(
-            JPQLStatement.DELIMITER.PERIOD);
-        jpqlQuery.append(joinClause.getEntityRelationShip()).append(
-            JPQLStatement.DELIMITER.SPACE);
+        jpqlQuery.append(relationShipAlias).append(JPQLStatement.DELIMITER.PERIOD);
+        jpqlQuery.append(joinClause.getEntityRelationShip()).append(JPQLStatement.DELIMITER.SPACE);
         jpqlQuery.append(joinClause.getEntityRelationShipAlias());
 
         relationShipAlias = joinClause.getEntityRelationShipAlias();
@@ -99,27 +93,21 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
 
         joinCondition = joinClause.getJoinCondition();
         if (joinCondition != null) {
-          joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE
-              + JPQLStatement.Operator.AND
-              + JPQLStatement.DELIMITER.SPACE);
+          joinWhereCondition.append(JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND + JPQLStatement.DELIMITER.SPACE);
 
           joinWhereCondition.append(joinCondition);
         }
       }
     } else {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.JOIN_CLAUSE_EXPECTED, null);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.JOIN_CLAUSE_EXPECTED, null);
     }
     String whereExpression = context.getWhereExpression();
     if (whereExpression != null || joinWhereCondition.length() > 0) {
-      jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.WHERE).append(
-          JPQLStatement.DELIMITER.SPACE);
+      jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.WHERE).append(JPQLStatement.DELIMITER.SPACE);
       if (whereExpression != null) {
         jpqlQuery.append(whereExpression);
         if (joinWhereCondition != null) {
-          jpqlQuery.append(JPQLStatement.DELIMITER.SPACE
-              + JPQLStatement.Operator.AND
-              + JPQLStatement.DELIMITER.SPACE);
+          jpqlQuery.append(JPQLStatement.DELIMITER.SPACE + JPQLStatement.Operator.AND + JPQLStatement.DELIMITER.SPACE);
         }
       }
       if (joinWhereCondition != null) {
@@ -128,28 +116,23 @@ public class JPQLJoinStatementBuilder extends JPQLStatementBuilder {
 
     }
 
-    if (context.getOrderByCollection() != null
-        && context.getOrderByCollection().size() > 0) {
+    if (context.getOrderByCollection() != null && context.getOrderByCollection().size() > 0) {
 
       StringBuilder orderByBuilder = new StringBuilder();
-      Iterator<Entry<String, String>> orderItr = context
-          .getOrderByCollection().entrySet().iterator();
+      Iterator<Entry<String, String>> orderItr = context.getOrderByCollection().entrySet().iterator();
 
       int i = 0;
 
       while (orderItr.hasNext()) {
         if (i != 0) {
-          orderByBuilder.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.DELIMITER.COMMA)
-              .append(JPQLStatement.DELIMITER.SPACE);
+          orderByBuilder.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.DELIMITER.COMMA).append(JPQLStatement.DELIMITER.SPACE);
         }
         Entry<String, String> entry = orderItr.next();
-        orderByBuilder.append(entry.getKey())
-            .append(JPQLStatement.DELIMITER.SPACE);
+        orderByBuilder.append(entry.getKey()).append(JPQLStatement.DELIMITER.SPACE);
         orderByBuilder.append(entry.getValue());
         i++;
       }
-      jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.ORDERBY).append(
-          JPQLStatement.DELIMITER.SPACE);
+      jpqlQuery.append(JPQLStatement.DELIMITER.SPACE).append(JPQLStatement.KEYWORD.ORDERBY).append(JPQLStatement.DELIMITER.SPACE);
       jpqlQuery.append(orderByBuilder);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
index 61cd133..a04804f 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectContext.java
@@ -32,8 +32,7 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType;
 import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectContextView;
 import org.apache.olingo.odata2.processor.core.jpa.ODataExpressionParser;
 
-public class JPQLSelectContext extends JPQLContext implements
-    JPQLSelectContextView {
+public class JPQLSelectContext extends JPQLContext implements JPQLSelectContextView {
 
   protected String selectExpression;
   protected HashMap<String, String> orderByCollection;
@@ -45,8 +44,7 @@ public class JPQLSelectContext extends JPQLContext implements
     this.isCountOnly = isCountOnly;
   }
 
-  protected final void setOrderByCollection(
-      final HashMap<String, String> orderByCollection) {
+  protected final void setOrderByCollection(final HashMap<String, String> orderByCollection) {
     this.orderByCollection = orderByCollection;
   }
 
@@ -73,15 +71,12 @@ public class JPQLSelectContext extends JPQLContext implements
     return whereCondition;
   }
 
-  public class JPQLSelectContextBuilder
-      extends
-      org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
+  public class JPQLSelectContextBuilder extends org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
 
     protected GetEntitySetUriInfo entitySetView;
 
     @Override
-    public JPQLContext build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public JPQLContext build() throws ODataJPAModelException, ODataJPARuntimeException {
       if (entitySetView != null) {
 
         try {
@@ -91,8 +86,7 @@ public class JPQLSelectContext extends JPQLContext implements
           } else {
             setType(JPQLContextType.SELECT);
           }
-          EdmEntityType entityType = entitySetView
-              .getTargetEntitySet().getEntityType();
+          EdmEntityType entityType = entitySetView.getTargetEntitySet().getEntityType();
           EdmMapping mapping = entityType.getMapping();
           if (mapping != null) {
             setJPAEntityName(mapping.getInternalName());
@@ -134,20 +128,15 @@ public class JPQLSelectContext extends JPQLContext implements
     /*
      * Generate Order By Clause Fields
      */
-    protected HashMap<String, String> generateOrderByFileds()
-        throws ODataJPARuntimeException, EdmException {
+    protected HashMap<String, String> generateOrderByFileds() throws ODataJPARuntimeException, EdmException {
 
       if (entitySetView.getOrderBy() != null) {
 
-        return ODataExpressionParser
-            .parseToJPAOrderByExpression(entitySetView.getOrderBy(), getJPAEntityAlias());
+        return ODataExpressionParser.parseToJPAOrderByExpression(entitySetView.getOrderBy(), getJPAEntityAlias());
 
-      } else if (entitySetView.getTop() != null
-          || entitySetView.getSkip() != null) {
+      } else if (entitySetView.getTop() != null || entitySetView.getSkip() != null) {
 
-        return ODataExpressionParser
-            .parseKeyPropertiesToJPAOrderByExpression(entitySetView.getTargetEntitySet()
-                .getEntityType().getKeyProperties(), getJPAEntityAlias());
+        return ODataExpressionParser.parseKeyPropertiesToJPAOrderByExpression(entitySetView.getTargetEntitySet().getEntityType().getKeyProperties(), getJPAEntityAlias());
       } else {
         return null;
       }
@@ -159,8 +148,7 @@ public class JPQLSelectContext extends JPQLContext implements
      */
     protected String generateWhereExpression() throws ODataException {
       if (entitySetView.getFilter() != null) {
-        return ODataExpressionParser
-            .parseToJPAWhereExpression(entitySetView.getFilter(), getJPAEntityAlias());
+        return ODataExpressionParser.parseToJPAWhereExpression(entitySetView.getFilter(), getJPAEntityAlias());
       }
       return null;
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
index f2ddcef..b8e8323 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleContext.java
@@ -54,9 +54,7 @@ public class JPQLSelectSingleContext extends JPQLContext implements JPQLSelectSi
     return selectExpression;
   }
 
-  public class JPQLSelectSingleContextBuilder
-      extends
-      org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
+  public class JPQLSelectSingleContextBuilder extends org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder {
 
     protected GetEntityUriInfo entityView;
 
@@ -68,8 +66,7 @@ public class JPQLSelectSingleContext extends JPQLContext implements JPQLSelectSi
 
           setType(JPQLContextType.SELECT_SINGLE);
 
-          EdmEntityType entityType = entityView
-              .getTargetEntitySet().getEntityType();
+          EdmEntityType entityType = entityView.getTargetEntitySet().getEntityType();
           EdmMapping mapping = entityType.getMapping();
           if (mapping != null) {
             setJPAEntityName(mapping.getInternalName());
@@ -84,9 +81,7 @@ public class JPQLSelectSingleContext extends JPQLContext implements JPQLSelectSi
           setSelectExpression(generateSelectExpression());
 
         } catch (EdmException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         }
 
       }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
index 7ffa49f..651024b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectSingleStatementBuilder.java
@@ -45,21 +45,17 @@ public class JPQLSelectSingleStatementBuilder extends JPQLStatementBuilder {
 
     StringBuilder jpqlQuery = new StringBuilder();
     String tableAlias = context.getJPAEntityAlias();
-    String fromClause = context.getJPAEntityName()
-        + JPQLStatement.DELIMITER.SPACE + tableAlias;
+    String fromClause = context.getJPAEntityName() + JPQLStatement.DELIMITER.SPACE + tableAlias;
 
-    jpqlQuery.append(JPQLStatement.KEYWORD.SELECT).append(
-        JPQLStatement.DELIMITER.SPACE);
+    jpqlQuery.append(JPQLStatement.KEYWORD.SELECT).append(JPQLStatement.DELIMITER.SPACE);
     jpqlQuery.append(context.getSelectExpression()).append(JPQLStatement.DELIMITER.SPACE);
     jpqlQuery.append(JPQLStatement.KEYWORD.FROM).append(JPQLStatement.DELIMITER.SPACE);
     jpqlQuery.append(fromClause);
 
-    if (context.getKeyPredicates() != null
-        && context.getKeyPredicates().size() > 0) {
+    if (context.getKeyPredicates() != null && context.getKeyPredicates().size() > 0) {
       jpqlQuery.append(JPQLStatement.DELIMITER.SPACE);
       jpqlQuery.append(JPQLStatement.KEYWORD.WHERE).append(JPQLStatement.DELIMITER.SPACE);
-      jpqlQuery.append(ODataExpressionParser.parseKeyPredicates(context.getKeyPredicates(),
-          context.getJPAEntityAlias()));
+      jpqlQuery.append(ODataExpressionParser.parseKeyPredicates(context.getKeyPredicates(), context.getJPAEntityAlias()));
     }
 
     return jpqlQuery.toString();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
index 8fc2792..34d4a58 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/jpql/JPQLSelectStatementBuilder.java
@@ -69,12 +69,10 @@ public class JPQLSelectStatementBuilder extends JPQLStatementBuilder {
       jpqlQuery.append(context.getWhereExpression());
     }
 
-    if (context.getOrderByCollection() != null
-        && context.getOrderByCollection().size() > 0) {
+    if (context.getOrderByCollection() != null && context.getOrderByCollection().size() > 0) {
 
       StringBuilder orderByBuilder = new StringBuilder();
-      Iterator<Entry<String, String>> orderItr = context
-          .getOrderByCollection().entrySet().iterator();
+      Iterator<Entry<String, String>> orderItr = context.getOrderByCollection().entrySet().iterator();
 
       int i = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
index 0f6e1ec..9f0a9e7 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociation.java
@@ -36,8 +36,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstra
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements
-    JPAEdmAssociationView {
+public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements JPAEdmAssociationView {
 
   private JPAEdmAssociationEndView associationEndView;
 
@@ -48,9 +47,7 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements
   private List<JPAEdmReferentialConstraintView> inconsistentRefConstraintViewList;
   private int numberOfSimilarEndPoints;
 
-  public JPAEdmAssociation(final JPAEdmAssociationEndView associationEndview,
-      final JPAEdmEntityTypeView entityTypeView,
-      final JPAEdmPropertyView propertyView, final int value) {
+  public JPAEdmAssociation(final JPAEdmAssociationEndView associationEndview, final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView, final int value) {
     super(associationEndview);
     associationEndView = associationEndview;
     numberOfSimilarEndPoints = value;
@@ -94,35 +91,23 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements
       for (String key : associationMap.keySet()) {
         Association association = associationMap.get(key);
         if (association != null) {
-          if (view.compare(association.getEnd1(),
-              association.getEnd2())) {
-            JPAEdmAssociationEndView associationEnd = associationEndMap
-                .get(association.getName());
-            if (associationEnd.getJoinColumnName() != null
-                && associationEnd
-                    .getJoinColumnReferenceColumnName() != null
-                && view.getJoinColumnName() != null
-                && view.getJoinColumnReferenceColumnName() != null) {
-              if (view.getJoinColumnName().equals(
-                  associationEnd.getJoinColumnName())
-                  && view.getJoinColumnReferenceColumnName()
-                      .equals(associationEnd
-                          .getJoinColumnReferenceColumnName())) {
+          if (view.compare(association.getEnd1(), association.getEnd2())) {
+            JPAEdmAssociationEndView associationEnd = associationEndMap.get(association.getName());
+            if (associationEnd.getJoinColumnName() != null && associationEnd.getJoinColumnReferenceColumnName() != null && view.getJoinColumnName() != null && view.getJoinColumnReferenceColumnName() != null) {
+              if (view.getJoinColumnName().equals(associationEnd.getJoinColumnName()) && view.getJoinColumnReferenceColumnName().equals(associationEnd.getJoinColumnReferenceColumnName())) {
                 currentAssociation = association;
                 return association;
               }
 
             }
             if (associationEnd.getMappedByName() != null) {
-              if (associationEnd.getMappedByName().equals(
-                  view.getOwningPropertyName())) {
+              if (associationEnd.getMappedByName().equals(view.getOwningPropertyName())) {
                 currentAssociation = association;
                 return association;
               }
             }
             if (associationEnd.getOwningPropertyName() != null) {
-              if (associationEnd.getOwningPropertyName().equals(
-                  view.getMappedByName())) {
+              if (associationEnd.getOwningPropertyName().equals(view.getMappedByName())) {
                 currentAssociation = association;
                 return association;
               }
@@ -135,22 +120,17 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements
   }
 
   @Override
-  public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView,
-      final JPAEdmAssociationEndView associationEndView) {
+  public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView, final JPAEdmAssociationEndView associationEndView) {
     if (associationView != null) {
       currentAssociation = associationView.getEdmAssociation();
-      associationMap
-          .put(currentAssociation.getName(), currentAssociation);
-      associationEndMap.put(currentAssociation.getName(),
-          associationEndView);
-      addJPAEdmRefConstraintView(associationView
-          .getJPAEdmReferentialConstraintView());
+      associationMap.put(currentAssociation.getName(), currentAssociation);
+      associationEndMap.put(currentAssociation.getName(), associationEndView);
+      addJPAEdmRefConstraintView(associationView.getJPAEdmReferentialConstraintView());
     }
   }
 
   @Override
-  public void addJPAEdmRefConstraintView(
-      final JPAEdmReferentialConstraintView refView) {
+  public void addJPAEdmRefConstraintView(final JPAEdmReferentialConstraintView refView) {
     if (refView != null && refView.isExists()) {
       inconsistentRefConstraintViewList.add(refView);
     }
@@ -167,43 +147,32 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements
   private class JPAEdmAssociationBuilder implements JPAEdmBuilder {
 
     @Override
-    public void build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
-      if (associationEndView != null
-          && searchAssociation(associationEndView) == null) {
+      if (associationEndView != null && searchAssociation(associationEndView) == null) {
         currentAssociation = new Association();
-        currentAssociation.setEnd1(associationEndView
-            .getEdmAssociationEnd1());
-        currentAssociation.setEnd2(associationEndView
-            .getEdmAssociationEnd2());
+        currentAssociation.setEnd1(associationEndView.getEdmAssociationEnd1());
+        currentAssociation.setEnd2(associationEndView.getEdmAssociationEnd2());
 
-        JPAEdmNameBuilder.build(JPAEdmAssociation.this,
-            numberOfSimilarEndPoints);
+        JPAEdmNameBuilder.build(JPAEdmAssociation.this, numberOfSimilarEndPoints);
 
-        associationMap.put(currentAssociation.getName(),
-            currentAssociation);
+        associationMap.put(currentAssociation.getName(), currentAssociation);
 
       } else if (!inconsistentRefConstraintViewList.isEmpty()) {
-        int inconsistentRefConstraintViewSize = inconsistentRefConstraintViewList
-            .size();
+        int inconsistentRefConstraintViewSize = inconsistentRefConstraintViewList.size();
         int index = 0;
         for (int i = 0; i < inconsistentRefConstraintViewSize; i++) {
-          JPAEdmReferentialConstraintView view = inconsistentRefConstraintViewList
-              .get(index);
+          JPAEdmReferentialConstraintView view = inconsistentRefConstraintViewList.get(index);
 
           if (view.isExists() && !view.isConsistent()) {
             view.getBuilder().build();
           }
           if (view.isConsistent()) {
             Association newAssociation = new Association();
-            copyAssociation(newAssociation, associationMap.get(view
-                .getEdmRelationShipName()));
-            newAssociation.setReferentialConstraint(view
-                .getEdmReferentialConstraint());
+            copyAssociation(newAssociation, associationMap.get(view.getEdmRelationShipName()));
+            newAssociation.setReferentialConstraint(view.getEdmReferentialConstraint());
             consistentAssociatonList.add(newAssociation);
-            associationMap.put(view.getEdmRelationShipName(),
-                newAssociation);
+            associationMap.put(view.getEdmRelationShipName(), newAssociation);
             inconsistentRefConstraintViewList.remove(index);
           } else {
             associationMap.remove(view.getEdmRelationShipName());
@@ -226,24 +195,19 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements
 
     }
 
-    private void copyAssociation(final Association copyToAssociation,
-        final Association copyFromAssociation) {
+    private void copyAssociation(final Association copyToAssociation, final Association copyFromAssociation) {
       copyToAssociation.setEnd1(copyFromAssociation.getEnd1());
       copyToAssociation.setEnd2(copyFromAssociation.getEnd2());
       copyToAssociation.setName(copyFromAssociation.getName());
-      copyToAssociation.setAnnotationAttributes(copyFromAssociation
-          .getAnnotationAttributes());
-      copyToAssociation.setAnnotationElements(copyFromAssociation
-          .getAnnotationElements());
-      copyToAssociation.setDocumentation(copyFromAssociation
-          .getDocumentation());
+      copyToAssociation.setAnnotationAttributes(copyFromAssociation.getAnnotationAttributes());
+      copyToAssociation.setAnnotationElements(copyFromAssociation.getAnnotationElements());
+      copyToAssociation.setDocumentation(copyFromAssociation.getDocumentation());
 
     }
   }
 
   @Override
-  public int getNumberOfAssociationsWithSimilarEndPoints(
-      final JPAEdmAssociationEndView view) {
+  public int getNumberOfAssociationsWithSimilarEndPoints(final JPAEdmAssociationEndView view) {
     int count = 0;
     AssociationEnd currentAssociationEnd1 = view.getEdmAssociationEnd1();
     AssociationEnd currentAssociationEnd2 = view.getEdmAssociationEnd2();
@@ -254,12 +218,7 @@ public class JPAEdmAssociation extends JPAEdmBaseViewImpl implements
       if (association != null) {
         end1 = association.getEnd1();
         end2 = association.getEnd2();
-        if ((end1.getType().equals(currentAssociationEnd1.getType()) && end2
-            .getType().equals(currentAssociationEnd2.getType()))
-            || (end1.getType().equals(
-                currentAssociationEnd2.getType()) && end2
-                .getType().equals(
-                    currentAssociationEnd1.getType()))) {
+        if ((end1.getType().equals(currentAssociationEnd1.getType()) && end2.getType().equals(currentAssociationEnd2.getType())) || (end1.getType().equals(currentAssociationEnd2.getType()) && end2.getType().equals(currentAssociationEnd1.getType()))) {
           count++;
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
index 91176ad..23e8e49 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEnd.java
@@ -35,8 +35,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmAssociationEnd extends JPAEdmBaseViewImpl implements
-    JPAEdmAssociationEndView {
+public class JPAEdmAssociationEnd extends JPAEdmBaseViewImpl implements JPAEdmAssociationEndView {
 
   private JPAEdmEntityTypeView entityTypeView = null;
   private JPAEdmPropertyView propertyView = null;
@@ -47,8 +46,7 @@ public class JPAEdmAssociationEnd extends JPAEdmBaseViewImpl implements
   private String mappedBy;
   private String ownerPropertyName;
 
-  public JPAEdmAssociationEnd(final JPAEdmEntityTypeView entityTypeView,
-      final JPAEdmPropertyView propertyView) {
+  public JPAEdmAssociationEnd(final JPAEdmEntityTypeView entityTypeView, final JPAEdmPropertyView propertyView) {
     super(entityTypeView);
     this.entityTypeView = entityTypeView;
     this.propertyView = propertyView;
@@ -83,19 +81,14 @@ public class JPAEdmAssociationEnd extends JPAEdmBaseViewImpl implements
       currentAssociationEnd1 = new AssociationEnd();
       currentAssociationEnd2 = new AssociationEnd();
 
-      JPAEdmNameBuilder.build(JPAEdmAssociationEnd.this, entityTypeView,
-          propertyView);
+      JPAEdmNameBuilder.build(JPAEdmAssociationEnd.this, entityTypeView, propertyView);
 
-      currentAssociationEnd1.setRole(currentAssociationEnd1.getType()
-          .getName());
-      currentAssociationEnd2.setRole(currentAssociationEnd2.getType()
-          .getName());
+      currentAssociationEnd1.setRole(currentAssociationEnd1.getType().getName());
+      currentAssociationEnd2.setRole(currentAssociationEnd2.getType().getName());
 
-      setEdmMultiplicity(propertyView.getJPAAttribute()
-          .getPersistentAttributeType());
+      setEdmMultiplicity(propertyView.getJPAAttribute().getPersistentAttributeType());
 
-      AnnotatedElement annotatedElement = (AnnotatedElement) propertyView.getJPAAttribute()
-          .getJavaMember();
+      AnnotatedElement annotatedElement = (AnnotatedElement) propertyView.getJPAAttribute().getJavaMember();
       if (annotatedElement != null) {
         joinColumn = annotatedElement.getAnnotation(JoinColumn.class);
         if (joinColumn != null) {
@@ -109,8 +102,7 @@ public class JPAEdmAssociationEnd extends JPAEdmBaseViewImpl implements
     }
 
     private void setEdmMultiplicity(final PersistentAttributeType type) {
-      AnnotatedElement annotatedElement = (AnnotatedElement) propertyView.getJPAAttribute()
-          .getJavaMember();
+      AnnotatedElement annotatedElement = (AnnotatedElement) propertyView.getJPAAttribute().getJavaMember();
       switch (type) {
       case ONE_TO_MANY:
         currentAssociationEnd1.setMultiplicity(EdmMultiplicity.ONE);
@@ -154,19 +146,7 @@ public class JPAEdmAssociationEnd extends JPAEdmBaseViewImpl implements
 
   @Override
   public boolean compare(final AssociationEnd end1, final AssociationEnd end2) {
-    if ((end1.getType().equals(currentAssociationEnd1.getType())
-        && end2.getType().equals(currentAssociationEnd2.getType())
-        && end1.getMultiplicity().equals(
-            currentAssociationEnd1.getMultiplicity()) && end2
-        .getMultiplicity().equals(
-            currentAssociationEnd2.getMultiplicity()))
-        || (end1.getType().equals(currentAssociationEnd2.getType())
-            && end2.getType().equals(
-                currentAssociationEnd1.getType())
-            && end1.getMultiplicity().equals(
-                currentAssociationEnd2.getMultiplicity()) && end2
-            .getMultiplicity().equals(
-                currentAssociationEnd1.getMultiplicity()))) {
+    if ((end1.getType().equals(currentAssociationEnd1.getType()) && end2.getType().equals(currentAssociationEnd2.getType()) && end1.getMultiplicity().equals(currentAssociationEnd1.getMultiplicity()) && end2.getMultiplicity().equals(currentAssociationEnd2.getMultiplicity())) || (end1.getType().equals(currentAssociationEnd2.getType()) && end2.getType().equals(currentAssociationEnd1.getType()) && end1.getMultiplicity().equals(currentAssociationEnd2.getMultiplicity()) && end2.getMultiplicity().equals(currentAssociationEnd1.getMultiplicity()))) {
       return true;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
index d6ce8ac..52ebe72 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSet.java
@@ -34,8 +34,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmAssociationSet extends JPAEdmBaseViewImpl implements
-    JPAEdmAssociationSetView {
+public class JPAEdmAssociationSet extends JPAEdmBaseViewImpl implements JPAEdmAssociationSetView {
 
   private JPAEdmSchemaView schemaView;
   private AssociationSet currentAssociationSet;
@@ -80,22 +79,16 @@ public class JPAEdmAssociationSet extends JPAEdmBaseViewImpl implements
         associationSetList = new ArrayList<AssociationSet>();
       }
 
-      JPAEdmAssociationView associationView = schemaView
-          .getJPAEdmAssociationView();
-      JPAEdmEntitySetView entitySetView = schemaView
-          .getJPAEdmEntityContainerView().getJPAEdmEntitySetView();
+      JPAEdmAssociationView associationView = schemaView.getJPAEdmAssociationView();
+      JPAEdmEntitySetView entitySetView = schemaView.getJPAEdmEntityContainerView().getJPAEdmEntitySetView();
 
-      List<EntitySet> entitySetList = entitySetView
-          .getConsistentEdmEntitySetList();
+      List<EntitySet> entitySetList = entitySetView.getConsistentEdmEntitySetList();
       if (associationView.isConsistent()) {
-        for (Association association : associationView
-            .getConsistentEdmAssociationList()) {
+        for (Association association : associationView.getConsistentEdmAssociationList()) {
 
           currentAssociation = association;
 
-          FullQualifiedName fQname = new FullQualifiedName(schemaView
-              .getEdmSchema().getNamespace(),
-              association.getName());
+          FullQualifiedName fQname = new FullQualifiedName(schemaView.getEdmSchema().getNamespace(), association.getName());
           currentAssociationSet = new AssociationSet();
           currentAssociationSet.setAssociation(fQname);
 
@@ -104,10 +97,7 @@ public class JPAEdmAssociationSet extends JPAEdmBaseViewImpl implements
           for (EntitySet entitySet : entitySetList) {
             fQname = entitySet.getEntityType();
             endFlag = 0;
-            if (fQname.equals(association.getEnd1().getType())
-                || ++endFlag > 1
-                || fQname.equals(association.getEnd2()
-                    .getType())) {
+            if (fQname.equals(association.getEnd1().getType()) || ++endFlag > 1 || fQname.equals(association.getEnd2().getType())) {
 
               AssociationSetEnd end = new AssociationSetEnd();
               end.setEntitySet(entitySet.getName());

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
index 4070032..1524402 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImpl.java
@@ -46,8 +46,7 @@ public abstract class JPAEdmBaseViewImpl implements JPAEdmBaseView {
   public JPAEdmBaseViewImpl(final ODataJPAContext context) {
     pUnitName = context.getPersistenceUnitName();
     metaModel = context.getEntityManagerFactory().getMetamodel();
-    jpaEdmMappingModelAccess = ODataJPAFactory.createFactory()
-        .getJPAAccessFactory().getJPAEdmMappingModelAccess(context);
+    jpaEdmMappingModelAccess = ODataJPAFactory.createFactory().getJPAAccessFactory().getJPAEdmMappingModelAccess(context);
     jpaEdmExtension = context.getJPAEdmExtension();
     jpaEdmMappingModelAccess.loadMappingModel();
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
index a68dbc6..42cc937 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexType.java
@@ -43,8 +43,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements
-    JPAEdmComplexTypeView {
+public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements JPAEdmComplexTypeView {
 
   private JPAEdmSchemaView schemaView;
   private ComplexType currentComplexType = null;
@@ -63,10 +62,8 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements
   public JPAEdmComplexType(final JPAEdmSchemaView view, final Attribute<?, ?> complexAttribute) {
     super(view);
     schemaView = view;
-    for (EmbeddableType<?> jpaEmbeddable : schemaView.getJPAMetaModel().getEmbeddables())
-    {
-      if (jpaEmbeddable.getJavaType().getName().equals(complexAttribute.getJavaType().getName()))
-      {
+    for (EmbeddableType<?> jpaEmbeddable : schemaView.getJPAMetaModel().getEmbeddables()) {
+      if (jpaEmbeddable.getJavaType().getName().equals(complexAttribute.getJavaType().getName())) {
         nestedComplexType = jpaEmbeddable;
         break;
       }
@@ -136,8 +133,7 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements
     if (expandedList == null) {
       expandedList = new ArrayList<Property>();
     }
-    for (Property property : complexType.getProperties())
-    {
+    for (Property property : complexType.getProperties()) {
       try {
         SimpleProperty newSimpleProperty = new SimpleProperty();
         SimpleProperty oldSimpleProperty = (SimpleProperty) property;
@@ -227,13 +223,11 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements
           continue;
         }
 
-        JPAEdmPropertyView propertyView = new JPAEdmProperty(
-            schemaView, JPAEdmComplexType.this);
+        JPAEdmPropertyView propertyView = new JPAEdmProperty(schemaView, JPAEdmComplexType.this);
         propertyView.getBuilder().build();
 
         currentComplexType = new ComplexType();
-        currentComplexType
-            .setProperties(propertyView.getEdmPropertyList());
+        currentComplexType.setProperties(propertyView.getEdmPropertyList());
         JPAEdmNameBuilder.build(JPAEdmComplexType.this);
 
         searchMap.put(searchKey, currentComplexType);
@@ -245,12 +239,8 @@ public class JPAEdmComplexType extends JPAEdmBaseViewImpl implements
 
     private boolean isExcluded(final JPAEdmComplexType jpaEdmComplexType) {
 
-      JPAEdmMappingModelAccess mappingModelAccess = jpaEdmComplexType
-          .getJPAEdmMappingModelAccess();
-      if (mappingModelAccess != null
-          && mappingModelAccess.isMappingModelExists()
-          && mappingModelAccess.checkExclusionOfJPAEmbeddableType(jpaEdmComplexType.getJPAEmbeddableType()
-              .getJavaType().getSimpleName())) {
+      JPAEdmMappingModelAccess mappingModelAccess = jpaEdmComplexType.getJPAEdmMappingModelAccess();
+      if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists() && mappingModelAccess.checkExclusionOfJPAEmbeddableType(jpaEdmComplexType.getJPAEmbeddableType().getJavaType().getSimpleName())) {
         return true;
       }
       return false;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
index 587c2ef..8af8f6b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainer.java
@@ -32,8 +32,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmFunctionImportView
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmEntityContainer extends JPAEdmBaseViewImpl implements
-    JPAEdmEntityContainerView {
+public class JPAEdmEntityContainer extends JPAEdmBaseViewImpl implements JPAEdmEntityContainerView {
 
   private JPAEdmEntitySetView entitySetView;
   private JPAEdmSchemaView schemaView;
@@ -106,8 +105,7 @@ public class JPAEdmEntityContainer extends JPAEdmBaseViewImpl implements
      * ************************************************************
      */
     @Override
-    public void build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
       currentEntityContainer = new EntityContainer();
 
@@ -119,8 +117,7 @@ public class JPAEdmEntityContainer extends JPAEdmBaseViewImpl implements
       entitySetView = new JPAEdmEntitySet(schemaView);
       entitySetView.getBuilder().build();
       if (entitySetView.isConsistent()) {
-        currentEntityContainer.setEntitySets(entitySetView
-            .getConsistentEdmEntitySetList());
+        currentEntityContainer.setEntitySets(entitySetView.getConsistentEdmEntitySetList());
       } else {
         isConsistent = false;
         return;
@@ -133,8 +130,7 @@ public class JPAEdmEntityContainer extends JPAEdmBaseViewImpl implements
       associationSetView = new JPAEdmAssociationSet(schemaView);
       associationSetView.getBuilder().build();
       if (associationSetView.isConsistent()) {
-        currentEntityContainer.setAssociationSets(associationSetView
-            .getConsistentEdmAssociationSetList());
+        currentEntityContainer.setAssociationSets(associationSetView.getConsistentEdmAssociationSetList());
       } else {
         isConsistent = false;
         return;
@@ -142,13 +138,10 @@ public class JPAEdmEntityContainer extends JPAEdmBaseViewImpl implements
 
       JPAEdmNameBuilder.build(JPAEdmEntityContainer.this);
       if (schemaView.getJPAEdmExtension() != null) {
-        JPAEdmFunctionImportView functionImportView = new JPAEdmFunctionImport(
-            schemaView);
+        JPAEdmFunctionImportView functionImportView = new JPAEdmFunctionImport(schemaView);
         functionImportView.getBuilder().build();
         if (functionImportView.getConsistentFunctionImportList() != null) {
-          currentEntityContainer
-              .setFunctionImports(functionImportView
-                  .getConsistentFunctionImportList());
+          currentEntityContainer.setFunctionImports(functionImportView.getConsistentFunctionImportList());
         }
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
index d79ac2d..4f52d7d 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySet.java
@@ -32,8 +32,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmEntitySet extends JPAEdmBaseViewImpl implements
-    JPAEdmEntitySetView {
+public class JPAEdmEntitySet extends JPAEdmBaseViewImpl implements JPAEdmEntitySetView {
 
   private EntitySet currentEntitySet = null;
   private List<EntitySet> consistentEntitySetList = null;
@@ -92,12 +91,10 @@ public class JPAEdmEntitySet extends JPAEdmBaseViewImpl implements
       if (entityTypeView.isConsistent() && entityTypeView.getConsistentEdmEntityTypes() != null) {
 
         String nameSpace = schemaView.getEdmSchema().getNamespace();
-        for (EntityType entityType : entityTypeView
-            .getConsistentEdmEntityTypes()) {
+        for (EntityType entityType : entityTypeView.getConsistentEdmEntityTypes()) {
 
           currentEntitySet = new EntitySet();
-          currentEntitySet.setEntityType(new FullQualifiedName(
-              nameSpace, entityType.getName()));
+          currentEntitySet.setEntityType(new FullQualifiedName(nameSpace, entityType.getName()));
           JPAEdmNameBuilder.build(JPAEdmEntitySet.this, entityTypeView);
           consistentEntitySetList.add(currentEntitySet);
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
index 7bb5a5c..9c158a9 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityType.java
@@ -37,8 +37,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements
-    JPAEdmEntityTypeView {
+public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements JPAEdmEntityTypeView {
 
   private JPAEdmSchemaView schemaView = null;
   private EntityType currentEdmEntityType = null;
@@ -85,11 +84,9 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements
   private class JPAEdmEntityTypeBuilder implements JPAEdmBuilder {
 
     @Override
-    public void build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
-      Set<javax.persistence.metamodel.EntityType<?>> jpaEntityTypes = metaModel
-          .getEntities();
+      Set<javax.persistence.metamodel.EntityType<?>> jpaEntityTypes = metaModel.getEntities();
 
       if (jpaEntityTypes == null || jpaEntityTypes.isEmpty() == true) {
         return;
@@ -112,36 +109,25 @@ public class JPAEdmEntityType extends JPAEdmBaseViewImpl implements
         JPAEdmPropertyView propertyView = new JPAEdmProperty(schemaView);
         propertyView.getBuilder().build();
 
-        currentEdmEntityType.setProperties(propertyView
-            .getEdmPropertyList());
+        currentEdmEntityType.setProperties(propertyView.getEdmPropertyList());
         if (propertyView.getJPAEdmNavigationPropertyView() != null) {
-          JPAEdmNavigationPropertyView navPropView = propertyView
-              .getJPAEdmNavigationPropertyView();
-          if (navPropView.getConsistentEdmNavigationProperties() != null
-              && !navPropView
-                  .getConsistentEdmNavigationProperties()
-                  .isEmpty()) {
-            currentEdmEntityType
-                .setNavigationProperties(navPropView
-                    .getConsistentEdmNavigationProperties());
+          JPAEdmNavigationPropertyView navPropView = propertyView.getJPAEdmNavigationPropertyView();
+          if (navPropView.getConsistentEdmNavigationProperties() != null && !navPropView.getConsistentEdmNavigationProperties().isEmpty()) {
+            currentEdmEntityType.setNavigationProperties(navPropView.getConsistentEdmNavigationProperties());
           }
         }
         JPAEdmKeyView keyView = propertyView.getJPAEdmKeyView();
         currentEdmEntityType.setKey(keyView.getEdmKey());
 
         consistentEntityTypes.add(currentEdmEntityType);
-        consistentEntityTypeMap.put(currentJPAEntityType.getName(),
-            currentEdmEntityType);
+        consistentEntityTypeMap.put(currentJPAEntityType.getName(), currentEdmEntityType);
       }
 
     }
 
     private boolean isExcluded(final JPAEdmEntityType jpaEdmEntityType) {
-      JPAEdmMappingModelAccess mappingModelAccess = jpaEdmEntityType
-          .getJPAEdmMappingModelAccess();
-      if (mappingModelAccess != null
-          && mappingModelAccess.isMappingModelExists()
-          && mappingModelAccess.checkExclusionOfJPAEntityType(jpaEdmEntityType.getJPAEntityType().getName())) {
+      JPAEdmMappingModelAccess mappingModelAccess = jpaEdmEntityType.getJPAEdmMappingModelAccess();
+      if (mappingModelAccess != null && mappingModelAccess.isMappingModelExists() && mappingModelAccess.checkExclusionOfJPAEntityType(jpaEdmEntityType.getJPAEntityType().getName())) {
         return true;
       }
       return false;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
index ad12196..ab89ce9 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImport.java
@@ -48,8 +48,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPATypeConvertor;
 
-public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
-    JPAEdmFunctionImportView {
+public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements JPAEdmFunctionImportView {
 
   private List<FunctionImport> consistentFunctionImportList = new ArrayList<FunctionImport>();
   private JPAEdmBuilder builder = null;
@@ -79,14 +78,11 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
     private JPAEdmComplexTypeView jpaEdmComplexTypeView = null;
 
     @Override
-    public void build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public void build() throws ODataJPAModelException, ODataJPARuntimeException {
 
-      HashMap<Class<?>, String[]> customOperations = schemaView
-          .getRegisteredOperations();
+      HashMap<Class<?>, String[]> customOperations = schemaView.getRegisteredOperations();
 
-      jpaEdmEntityTypeView = schemaView.getJPAEdmEntityContainerView()
-          .getJPAEdmEntitySetView().getJPAEdmEntityTypeView();
+      jpaEdmEntityTypeView = schemaView.getJPAEdmEntityContainerView().getJPAEdmEntitySetView().getJPAEdmEntityTypeView();
       jpaEdmComplexTypeView = schemaView.getJPAEdmComplexTypeView();
 
       if (customOperations != null) {
@@ -110,8 +106,7 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
             try {
               if (operationNames != null) {
                 for (Method method2 : methods) {
-                  if (method2.getName().equals(
-                      operationNames[i])) {
+                  if (method2.getName().equals(operationNames[i])) {
                     found = true;
                     method = method2;
                     break;
@@ -128,24 +123,20 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
 
               FunctionImport functionImport = buildFunctionImport(method);
               if (functionImport != null) {
-                consistentFunctionImportList
-                    .add(functionImport);
+                consistentFunctionImportList.add(functionImport);
               }
 
             } catch (SecurityException e) {
-              throw ODataJPAModelException.throwException(
-                  ODataJPAModelException.GENERAL, e);
+              throw ODataJPAModelException.throwException(ODataJPAModelException.GENERAL, e);
             }
           }
         }
       }
     }
 
-    private FunctionImport buildFunctionImport(final Method method)
-        throws ODataJPAModelException {
+    private FunctionImport buildFunctionImport(final Method method) throws ODataJPAModelException {
 
-      org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation = method
-          .getAnnotation(org.apache.olingo.odata2.api.annotation.edm.FunctionImport.class);
+      org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation = method.getAnnotation(org.apache.olingo.odata2.api.annotation.edm.FunctionImport.class);
       if (annotation != null && annotation.returnType() != ReturnType.NONE) {
         FunctionImport functionImport = new FunctionImport();
 
@@ -170,8 +161,7 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
       return null;
     }
 
-    private void buildParameter(final FunctionImport functionImport, final Method method)
-        throws ODataJPAModelException {
+    private void buildParameter(final FunctionImport functionImport, final Method method) throws ODataJPAModelException {
 
       Annotation[][] annotations = method.getParameterAnnotations();
       Class<?>[] parameterTypes = method.getParameterTypes();
@@ -186,20 +176,13 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
             Parameter annotation = (Parameter) element;
             FunctionImportParameter functionImportParameter = new FunctionImportParameter();
             if (annotation.name().equals("")) {
-              throw ODataJPAModelException.throwException(
-                  ODataJPAModelException.FUNC_PARAM_NAME_EXP
-                      .addContent(method
-                          .getDeclaringClass()
-                          .getName(), method
-                          .getName()), null);
+              throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_PARAM_NAME_EXP.addContent(method.getDeclaringClass().getName(), method.getName()), null);
             } else {
               functionImportParameter.setName(annotation.name());
             }
 
-            functionImportParameter.setType(JPATypeConvertor
-                .convertToEdmSimpleType(parameterType, null));
-            functionImportParameter.setMode(annotation.mode()
-                .toString());
+            functionImportParameter.setType(JPATypeConvertor.convertToEdmSimpleType(parameterType, null));
+            functionImportParameter.setMode(annotation.mode().toString());
 
             Facets facets = new Facets();
             if (annotation.facets().maxLength() > 0) {
@@ -231,10 +214,7 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
       }
     }
 
-    private void buildReturnType(final FunctionImport functionImport,
-        final Method method,
-        final org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation)
-        throws ODataJPAModelException {
+    private void buildReturnType(final FunctionImport functionImport, final Method method, final org.apache.olingo.odata2.api.annotation.edm.FunctionImport annotation) throws ODataJPAModelException {
       ReturnType returnType = annotation.returnType();
       Multiplicity multiplicity = null;
 
@@ -251,79 +231,46 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
         if (returnType == ReturnType.ENTITY_TYPE) {
           String entitySet = annotation.entitySet();
           if (entitySet.equals("")) {
-            throw ODataJPAModelException
-                .throwException(
-                    ODataJPAModelException.FUNC_ENTITYSET_EXP,
-                    null);
+            throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_ENTITYSET_EXP, null);
           }
           functionImport.setEntitySet(entitySet);
         }
 
         Class<?> methodReturnType = method.getReturnType();
-        if (methodReturnType == null
-            || methodReturnType.getName().equals("void")) {
-          throw ODataJPAModelException.throwException(
-              ODataJPAModelException.FUNC_RETURN_TYPE_EXP
-                  .addContent(method.getDeclaringClass(),
-                      method.getName()), null);
+        if (methodReturnType == null || methodReturnType.getName().equals("void")) {
+          throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.addContent(method.getDeclaringClass(), method.getName()), null);
         }
         switch (returnType) {
         case ENTITY_TYPE:
           EntityType edmEntityType = null;
           if (multiplicity == Multiplicity.ONE) {
-            edmEntityType = jpaEdmEntityTypeView
-                .searchEdmEntityType(methodReturnType
-                    .getSimpleName());
+            edmEntityType = jpaEdmEntityTypeView.searchEdmEntityType(methodReturnType.getSimpleName());
           } else if (multiplicity == Multiplicity.MANY) {
-            edmEntityType = jpaEdmEntityTypeView
-                .searchEdmEntityType(getReturnTypeSimpleName(method));
+            edmEntityType = jpaEdmEntityTypeView.searchEdmEntityType(getReturnTypeSimpleName(method));
           }
 
           if (edmEntityType == null) {
-            throw ODataJPAModelException
-                .throwException(
-                    ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND
-                        .addContent(
-                            method.getDeclaringClass(),
-                            method.getName(),
-                            methodReturnType
-                                .getSimpleName()),
-                    null);
+            throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND.addContent(method.getDeclaringClass(), method.getName(), methodReturnType.getSimpleName()), null);
           }
-          functionReturnType.setTypeName(JPAEdmNameBuilder.build(
-              schemaView, edmEntityType.getName()));
+          functionReturnType.setTypeName(JPAEdmNameBuilder.build(schemaView, edmEntityType.getName()));
           break;
         case SCALAR:
 
-          EdmSimpleTypeKind edmSimpleTypeKind = JPATypeConvertor
-              .convertToEdmSimpleType(methodReturnType, null);
-          functionReturnType.setTypeName(edmSimpleTypeKind
-              .getFullQualifiedName());
+          EdmSimpleTypeKind edmSimpleTypeKind = JPATypeConvertor.convertToEdmSimpleType(methodReturnType, null);
+          functionReturnType.setTypeName(edmSimpleTypeKind.getFullQualifiedName());
 
           break;
         case COMPLEX_TYPE:
           ComplexType complexType = null;
           if (multiplicity == Multiplicity.ONE) {
-            complexType = jpaEdmComplexTypeView
-                .searchEdmComplexType(methodReturnType
-                    .getName());
+            complexType = jpaEdmComplexTypeView.searchEdmComplexType(methodReturnType.getName());
           } else if (multiplicity == Multiplicity.MANY) {
-            complexType = jpaEdmComplexTypeView
-                .searchEdmComplexType(getReturnTypeName(method));
+            complexType = jpaEdmComplexTypeView.searchEdmComplexType(getReturnTypeName(method));
           }
           if (complexType == null) {
-            throw ODataJPAModelException
-                .throwException(
-                    ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND
-                        .addContent(
-                            method.getDeclaringClass(),
-                            method.getName(),
-                            methodReturnType
-                                .getSimpleName()),
-                    null);
+            throw ODataJPAModelException.throwException(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND.addContent(method.getDeclaringClass(), method.getName(), methodReturnType.getSimpleName()), null);
           }
-          functionReturnType.setTypeName(JPAEdmNameBuilder.build(
-              schemaView, complexType.getName()));
+          functionReturnType.setTypeName(JPAEdmNameBuilder.build(schemaView, complexType.getName()));
           break;
         default:
           break;
@@ -334,8 +281,7 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
 
     private String getReturnTypeName(final Method method) {
       try {
-        ParameterizedType pt = (ParameterizedType) method
-            .getGenericReturnType();
+        ParameterizedType pt = (ParameterizedType) method.getGenericReturnType();
         Type t = pt.getActualTypeArguments()[0];
         return ((Class<?>) t).getName();
       } catch (ClassCastException e) {
@@ -345,8 +291,7 @@ public class JPAEdmFunctionImport extends JPAEdmBaseViewImpl implements
 
     private String getReturnTypeSimpleName(final Method method) {
       try {
-        ParameterizedType pt = (ParameterizedType) method
-            .getGenericReturnType();
+        ParameterizedType pt = (ParameterizedType) method.getGenericReturnType();
         Type t = pt.getActualTypeArguments()[0];
         return ((Class<?>) t).getSimpleName();
       } catch (ClassCastException e) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
index bc4a370..cfe47fc 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKey.java
@@ -46,8 +46,7 @@ public class JPAEdmKey extends JPAEdmBaseViewImpl implements JPAEdmKeyView {
     propertyView = view;
   }
 
-  public JPAEdmKey(final JPAEdmComplexTypeView complexTypeView,
-      final JPAEdmPropertyView propertyView) {
+  public JPAEdmKey(final JPAEdmComplexTypeView complexTypeView, final JPAEdmPropertyView propertyView) {
     super(complexTypeView);
     this.propertyView = propertyView;
     this.complexTypeView = complexTypeView;
@@ -86,9 +85,7 @@ public class JPAEdmKey extends JPAEdmBaseViewImpl implements JPAEdmKeyView {
       }
 
       if (isBuildModeComplexType) {
-        ComplexType complexType = complexTypeView
-            .searchEdmComplexType(propertyView
-                .getJPAAttribute().getJavaType().getName());
+        ComplexType complexType = complexTypeView.searchEdmComplexType(propertyView.getJPAAttribute().getJavaType().getName());
         normalizeComplexKey(complexType, propertyRefList);
       } else {
         PropertyRef propertyRef = new PropertyRef();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
index d5e16f6..7224bc6 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationProperty.java
@@ -30,8 +30,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 import org.apache.olingo.odata2.processor.core.jpa.access.model.JPAEdmNameBuilder;
 
-public class JPAEdmNavigationProperty extends JPAEdmBaseViewImpl implements
-    JPAEdmNavigationPropertyView {
+public class JPAEdmNavigationProperty extends JPAEdmBaseViewImpl implements JPAEdmNavigationPropertyView {
 
   private JPAEdmAssociationView associationView = null;
   private NavigationProperty currentNavigationProperty = null;
@@ -39,14 +38,12 @@ public class JPAEdmNavigationProperty extends JPAEdmBaseViewImpl implements
   private List<NavigationProperty> consistentNavigationProperties = null;
   private int count;
 
-  public JPAEdmNavigationProperty(final JPAEdmAssociationView associationView,
-      final JPAEdmPropertyView propertyView, final int countNumber) {
+  public JPAEdmNavigationProperty(final JPAEdmAssociationView associationView, final JPAEdmPropertyView propertyView, final int countNumber) {
     super(associationView);
     this.associationView = associationView;
     this.propertyView = propertyView;
     count = countNumber;
-    if (consistentNavigationProperties == null)
-    {
+    if (consistentNavigationProperties == null) {
       consistentNavigationProperties = new ArrayList<NavigationProperty>();
     }
   }
@@ -72,8 +69,7 @@ public class JPAEdmNavigationProperty extends JPAEdmBaseViewImpl implements
     public void build() throws ODataJPAModelException {
 
       currentNavigationProperty = new NavigationProperty();
-      JPAEdmNameBuilder.build(associationView, propertyView,
-          JPAEdmNavigationProperty.this, count);
+      JPAEdmNameBuilder.build(associationView, propertyView, JPAEdmNavigationProperty.this, count);
       consistentNavigationProperties.add(currentNavigationProperty);
     }
 
@@ -90,8 +86,7 @@ public class JPAEdmNavigationProperty extends JPAEdmBaseViewImpl implements
   }
 
   @Override
-  public void addJPAEdmNavigationPropertyView(
-      final JPAEdmNavigationPropertyView view) {
+  public void addJPAEdmNavigationPropertyView(final JPAEdmNavigationPropertyView view) {
     if (view != null && view.isConsistent()) {
       currentNavigationProperty = view.getEdmNavigationProperty();
       consistentNavigationProperties.add(currentNavigationProperty);


[02/22] git commit: add checkstyle for code conventions

Posted by sk...@apache.org.
add checkstyle for code conventions


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

Branch: refs/heads/master
Commit: be9827daa2ac0bd8a3089b13f644fb1d34abb5e3
Parents: 622a069
Author: Stephan Klevenz <st...@sap.com>
Authored: Wed Jul 31 09:43:35 2013 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Wed Jul 31 09:51:40 2013 +0200

----------------------------------------------------------------------
 pom.xml                       | 27 ++++++++++++++++++++++++++-
 src/eclipse/codetemplates.xml | 34 ----------------------------------
 2 files changed, 26 insertions(+), 35 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/be9827da/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1fb30b..28deaa8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>${project.groupId}-${project.artifactId}</name>
-	
+
 	<parent>
 		<groupId>org.apache</groupId>
 		<artifactId>apache</artifactId>
@@ -122,6 +122,10 @@
 		<pluginManagement>
 			<plugins>
 				<plugin>
+					<artifactId>maven-checkstyle-plugin</artifactId>
+					<version>2.10</version>
+				</plugin>
+				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>2.3.2</version>
@@ -259,6 +263,27 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+				<configuration>
+					<outputFileFormat>xml</outputFileFormat>
+					<consoleOutput>true</consoleOutput>
+					<enableRSS>false</enableRSS>
+					<linkXRef>false</linkXRef>
+					<configLocation>src/checkstyle/config.xml</configLocation>
+					<sourceDirectory>${basedir}/src</sourceDirectory>
+					<encoding>UTF-8</encoding>
+					<failOnViolation>true</failOnViolation>
+					<violationSeverity>error</violationSeverity>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/be9827da/src/eclipse/codetemplates.xml
----------------------------------------------------------------------
diff --git a/src/eclipse/codetemplates.xml b/src/eclipse/codetemplates.xml
deleted file mode 100644
index c23ee59..0000000
--- a/src/eclipse/codetemplates.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--
-
-    (c) 2013 by SAP AG
-
--->
-<!--
-
-    (c) {$year} by SAP AG
-
--->
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><templates><template autoinsert="false" context="filecomment_context" deleted="false" description="Comment for created Java files" enabled="true" id="org.eclipse.jdt.ui.text.codetemplates.filecomment" name="filecomment">/**
-<!--
-
- 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.
-
--->
-
- * (c) ${year} by SAP AG
- */</template></templates>


[14/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
index fdff58b..aed7094 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableMock.java
@@ -47,8 +47,7 @@ public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -68,8 +67,7 @@ public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -89,8 +87,7 @@ public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -115,8 +112,7 @@ public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 
@@ -141,8 +137,7 @@ public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -167,8 +162,7 @@ public class JPAEmbeddableMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
index 4bef724..9201f50 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEmbeddableTypeMock.java
@@ -47,8 +47,7 @@ public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -68,8 +67,7 @@ public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -89,8 +87,7 @@ public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -115,8 +112,7 @@ public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 
@@ -141,8 +137,7 @@ public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -167,8 +162,7 @@ public class JPAEmbeddableTypeMock<X> implements EmbeddableType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
index 27fea5c..0be8012 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAEntityTypeMock.java
@@ -94,8 +94,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -115,8 +114,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -136,8 +134,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -162,8 +159,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 
@@ -188,8 +184,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -214,8 +209,7 @@ public abstract class JPAEntityTypeMock<X> implements EntityType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
index 217275c..2eadb78 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAJavaMemberMock.java
@@ -47,8 +47,7 @@ public class JPAJavaMemberMock implements Member, AnnotatedElement, Annotation {
   }
 
   @Override
-  public boolean isAnnotationPresent(
-      final Class<? extends Annotation> annotationClass) {
+  public boolean isAnnotationPresent(final Class<? extends Annotation> annotationClass) {
     return false;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
index 520ba8e..92331ae 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/mock/model/JPAManagedTypeMock.java
@@ -57,8 +57,7 @@ public class JPAManagedTypeMock<X> implements ManagedType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<? super X, E> getCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -78,8 +77,7 @@ public class JPAManagedTypeMock<X> implements ManagedType<X> {
   }
 
   @Override
-  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0,
-      final Class<E> arg1) {
+  public <E> CollectionAttribute<X, E> getDeclaredCollection(final String arg0, final Class<E> arg1) {
     return null;
   }
 
@@ -99,8 +97,7 @@ public class JPAManagedTypeMock<X> implements ManagedType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<X, K, V> getDeclaredMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -125,8 +122,7 @@ public class JPAManagedTypeMock<X> implements ManagedType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<X, Y> getDeclaredSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 
@@ -151,8 +147,7 @@ public class JPAManagedTypeMock<X> implements ManagedType<X> {
   }
 
   @Override
-  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0,
-      final Class<K> arg1, final Class<V> arg2) {
+  public <K, V> MapAttribute<? super X, K, V> getMap(final String arg0, final Class<K> arg1, final Class<V> arg2) {
     return null;
   }
 
@@ -177,8 +172,7 @@ public class JPAManagedTypeMock<X> implements ManagedType<X> {
   }
 
   @Override
-  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(
-      final String arg0, final Class<Y> arg1) {
+  public <Y> SingularAttribute<? super X, Y> getSingularAttribute(final String arg0, final Class<Y> arg1) {
     return null;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
index 8930e62..37f5491 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationEndTest.java
@@ -26,9 +26,6 @@ import static org.junit.Assert.fail;
 
 import javax.persistence.metamodel.Attribute;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
@@ -40,6 +37,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAAttributeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEdmMockData.SimpleType;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEdmMockData.SimpleType.SimpleTypeA;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPAEdmAssociationEndTest extends JPAEdmTestModelView {
 
@@ -56,8 +55,7 @@ public class JPAEdmAssociationEndTest extends JPAEdmTestModelView {
   @BeforeClass
   public static void setup() {
     objJPAEdmAssociationEndTest = new JPAEdmAssociationEndTest();
-    objJPAEdmAssociationEnd = new JPAEdmAssociationEnd(
-        objJPAEdmAssociationEndTest, objJPAEdmAssociationEndTest);
+    objJPAEdmAssociationEnd = new JPAEdmAssociationEnd(objJPAEdmAssociationEndTest, objJPAEdmAssociationEndTest);
     try {
       objJPAEdmAssociationEnd.getBuilder().build();
     } catch (ODataJPAModelException e) {
@@ -84,29 +82,24 @@ public class JPAEdmAssociationEndTest extends JPAEdmTestModelView {
 
   @Test
   public void testGetAssociationEnd1() {
-    AssociationEnd associationEnd = objJPAEdmAssociationEnd
-        .getEdmAssociationEnd1();
+    AssociationEnd associationEnd = objJPAEdmAssociationEnd.getEdmAssociationEnd1();
     assertEquals(associationEnd.getType().getName(), "SOID");
   }
 
   @Test
   public void testGetAssociationEnd2() {
-    AssociationEnd associationEnd = objJPAEdmAssociationEnd
-        .getEdmAssociationEnd2();
+    AssociationEnd associationEnd = objJPAEdmAssociationEnd.getEdmAssociationEnd2();
     assertEquals(associationEnd.getType().getName(), "String");
   }
 
   @Test
   public void testCompare() {
-    assertTrue(objJPAEdmAssociationEnd.compare(
-        getAssociationEnd("SOID", 1), getAssociationEnd("String", 1)));
-    assertFalse(objJPAEdmAssociationEnd.compare(
-        getAssociationEnd("String", 2), getAssociationEnd("SOID", 1)));
+    assertTrue(objJPAEdmAssociationEnd.compare(getAssociationEnd("SOID", 1), getAssociationEnd("String", 1)));
+    assertFalse(objJPAEdmAssociationEnd.compare(getAssociationEnd("String", 2), getAssociationEnd("SOID", 1)));
   }
 
   @Test
-  public void testBuildAssociationEnd()
-  {
+  public void testBuildAssociationEnd() {
     assertEquals("SOID", objJPAEdmAssociationEnd.getEdmAssociationEnd1().getType().getName());
     assertEquals(new FullQualifiedName("salesorderprocessing", "SOID"), objJPAEdmAssociationEnd.getEdmAssociationEnd1().getType());
     assertTrue(objJPAEdmAssociationEnd.isConsistent());
@@ -122,16 +115,14 @@ public class JPAEdmAssociationEndTest extends JPAEdmTestModelView {
       associationEnd.setMultiplicity(EdmMultiplicity.ONE);
     } else if (variant == VARIANT3) {
       associationEnd.setMultiplicity(EdmMultiplicity.ZERO_TO_ONE);
-    }
-    else {
+    } else {
       associationEnd.setMultiplicity(EdmMultiplicity.MANY);//
     }
     return associationEnd;
   }
 
   private FullQualifiedName getFullQualifiedName(final String typeName) {
-    FullQualifiedName fullQualifiedName = new FullQualifiedName(PUNIT_NAME,
-        typeName);
+    FullQualifiedName fullQualifiedName = new FullQualifiedName(PUNIT_NAME, typeName);
     return fullQualifiedName;
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
index a2ac371..47126a7 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationSetTest.java
@@ -26,9 +26,6 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
 import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
@@ -43,6 +40,8 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmAssociationSetTest extends JPAEdmTestModelView {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
index 857c246..72e8465 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmAssociationTest.java
@@ -34,10 +34,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.metamodel.Attribute;
 
-import org.easymock.EasyMock;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
@@ -51,6 +47,9 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAAttributeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEdmMockData.SimpleType;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEdmMockData.SimpleType.SimpleTypeA;
+import org.easymock.EasyMock;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPAEdmAssociationTest extends JPAEdmTestModelView {
 
@@ -76,8 +75,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
   @Override
   public AssociationEnd getEdmAssociationEnd1() {
     AssociationEnd associationEnd = new AssociationEnd();
-    associationEnd.setType(new FullQualifiedName("salesorderprocessing",
-        "SalesOrderHeader"));
+    associationEnd.setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader"));
     associationEnd.setRole("SalesOrderHeader");
     associationEnd.setMultiplicity(EdmMultiplicity.ONE);
     return associationEnd;
@@ -86,8 +84,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
   @Override
   public AssociationEnd getEdmAssociationEnd2() {
     AssociationEnd associationEnd = new AssociationEnd();
-    associationEnd.setType(new FullQualifiedName("salesorderprocessing",
-        "String"));
+    associationEnd.setType(new FullQualifiedName("salesorderprocessing", "String"));
     associationEnd.setRole("String");
     associationEnd.setMultiplicity(EdmMultiplicity.MANY);
     return associationEnd;
@@ -96,10 +93,8 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
   @Override
   public Association getEdmAssociation() {
     Association association = new Association();
-    association.setEnd1(new AssociationEnd().setType(new FullQualifiedName(
-        "salesorderprocessing", "SalesOrderHeader")));
-    association.setEnd2(new AssociationEnd().setType(new FullQualifiedName(
-        "salesorderprocessing", "String")));
+    association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
+    association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")));
 
     return association;
   }
@@ -111,8 +106,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
 
   @Override
   public JPAEdmReferentialConstraintView getJPAEdmReferentialConstraintView() {
-    JPAEdmReferentialConstraint refConstraintView = new JPAEdmReferentialConstraint(
-        localView, localView, localView);
+    JPAEdmReferentialConstraint refConstraintView = new JPAEdmReferentialConstraint(localView, localView, localView);
     return refConstraintView;
   }
 
@@ -171,8 +165,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
   @Test
   public void testGetEdmAssociation() {
     assertNotNull(objAssociation.getEdmAssociation());
-    assertEquals(objAssociation.getEdmAssociation().getName(),
-        ASSOCIATION_NAME);
+    assertEquals(objAssociation.getEdmAssociation().getName(), ASSOCIATION_NAME);
   }
 
   @Test
@@ -224,8 +217,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
       }
 
       @Override
-      public int getNumberOfAssociationsWithSimilarEndPoints(
-          final JPAEdmAssociationEndView view) {
+      public int getNumberOfAssociationsWithSimilarEndPoints(final JPAEdmAssociationEndView view) {
         return 1;
       }
 
@@ -242,8 +234,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
       }
 
       @SuppressWarnings("hiding")
-      class AttributeMock<Object, String> extends
-          JPAAttributeMock<Object, String> {
+      class AttributeMock<Object, String> extends JPAAttributeMock<Object, String> {
 
         @SuppressWarnings("unchecked")
         @Override
@@ -272,8 +263,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
         class AnnotatedElementMock implements AnnotatedElement, Member {
 
           @Override
-          public boolean isAnnotationPresent(
-              final Class<? extends Annotation> annotationClass) {
+          public boolean isAnnotationPresent(final Class<? extends Annotation> annotationClass) {
             return true;
           }
 
@@ -286,8 +276,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
               EasyMock.expect(joinColumn.referencedColumnName()).andStubReturn("DEMO_ID");
               EasyMock.replay(joinColumn);
               return joinColumn;
-            }
-            else {
+            } else {
               OneToMany oneToMany = EasyMock.createMock(OneToMany.class);
               EasyMock.expect(oneToMany.mappedBy()).andStubReturn("demo");
               EasyMock.replay(oneToMany);
@@ -334,8 +323,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
       }
     }
     TestAssociationEndView objJPAEdmAssociationEndTest = new TestAssociationEndView();
-    JPAEdmAssociationEnd objJPAEdmAssociationEnd = new JPAEdmAssociationEnd(
-        objJPAEdmAssociationEndTest, objJPAEdmAssociationEndTest);
+    JPAEdmAssociationEnd objJPAEdmAssociationEnd = new JPAEdmAssociationEnd(objJPAEdmAssociationEndTest, objJPAEdmAssociationEndTest);
     try {
       objJPAEdmAssociationEnd.getBuilder().build();
       Field field = objAssociation.getClass().getDeclaredField("associationEndMap");
@@ -368,8 +356,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
       @Override
       public AssociationEnd getEdmAssociationEnd1() {
         AssociationEnd associationEnd = new AssociationEnd();
-        associationEnd.setType(new FullQualifiedName(
-            "salesorderprocessing", "SalesOrderHeader"));
+        associationEnd.setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader"));
         associationEnd.setRole("SalesOrderHeader");
         associationEnd.setMultiplicity(EdmMultiplicity.ONE);
         return associationEnd;
@@ -378,8 +365,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
       @Override
       public AssociationEnd getEdmAssociationEnd2() {
         AssociationEnd associationEnd = new AssociationEnd();
-        associationEnd.setType(new FullQualifiedName(
-            "salesorderprocessing", "SalesOrderItem"));
+        associationEnd.setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem"));
         associationEnd.setRole("SalesOrderItem");
         associationEnd.setMultiplicity(EdmMultiplicity.MANY);
         return associationEnd;
@@ -388,19 +374,14 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
       @Override
       public Association getEdmAssociation() {
         Association association = new Association();
-        association.setEnd1(new AssociationEnd()
-            .setType(new FullQualifiedName("salesorderprocessing",
-                "SalesOrderHeader")));
-        association.setEnd2(new AssociationEnd()
-            .setType(new FullQualifiedName("salesorderprocessing",
-                "SalesOrderItem")));
+        association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
+        association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")));
 
         return association;
       }
     }
     LocalJPAAssociationView assocViewObj = new LocalJPAAssociationView();
-    JPAEdmAssociation objLocalAssociation = new JPAEdmAssociation(
-        assocViewObj, assocViewObj, assocViewObj, 1);
+    JPAEdmAssociation objLocalAssociation = new JPAEdmAssociation(assocViewObj, assocViewObj, assocViewObj, 1);
     try {
       objLocalAssociation.getBuilder().build();
     } catch (ODataJPARuntimeException e) {
@@ -427,8 +408,7 @@ public class JPAEdmAssociationTest extends JPAEdmTestModelView {
     }
 
     objAssociation.addJPAEdmRefConstraintView(localView);
-    assertTrue(objAssociation.getConsistentEdmAssociationList()
-        .size() > 0);
+    assertTrue(objAssociation.getConsistentEdmAssociationList().size() > 0);
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
index 6e92aa0..a291058 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmBaseViewImplTest.java
@@ -24,11 +24,10 @@ import static org.junit.Assert.assertTrue;
 
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmBaseViewImplTest extends JPAEdmTestModelView {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
index 88f1210..ef3b7d8 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmComplexTypeTest.java
@@ -33,9 +33,6 @@ import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EmbeddableType;
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.ComplexType;
 import org.apache.olingo.odata2.api.edm.provider.Mapping;
@@ -49,6 +46,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEmbeddableMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPASingularAttributeMock;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
 
@@ -72,8 +71,7 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
   @Override
   public EmbeddableType<?> getJPAEmbeddableType() {
     @SuppressWarnings("hiding")
-    class JPAComplexAttribute<Long> extends JPAEmbeddableMock<Long>
-    {
+    class JPAComplexAttribute<Long> extends JPAEmbeddableMock<Long> {
 
       @SuppressWarnings("unchecked")
       @Override
@@ -131,8 +129,7 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
   }
 
   @Test
-  public void testSearchComplexTypeFullQualifiedNameNegative()
-  {
+  public void testSearchComplexTypeFullQualifiedNameNegative() {
     assertNull(objComplexType.searchEdmComplexType(new FullQualifiedName("salesorderprocessing", "lang.String")));
   }
 
@@ -157,8 +154,7 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
     }
 
     objComplexType.addJPAEdmCompleTypeView(localView);
-    assertTrue(objComplexType.getConsistentEdmComplexTypes()
-        .size() > 1);
+    assertTrue(objComplexType.getConsistentEdmComplexTypes().size() > 1);
   }
 
   @Test
@@ -175,11 +171,9 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
     properties.add(new SimpleProperty().setName("LINAME").setMapping((Mapping) mapping2));
     complexType.setProperties(properties);
     List<Property> expandedList = null;
-    try
-    {
+    try {
       objComplexType.expandEdmComplexType(complexType, expandedList, "SalesOrderItemKey");
-    } catch (ClassCastException e)
-    {
+    } catch (ClassCastException e) {
       assertTrue(false);
     }
     assertTrue(true);
@@ -187,8 +181,7 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
   }
 
   @Test
-  public void testComplexTypeCreation()
-  {
+  public void testComplexTypeCreation() {
     try {
       objComplexType.getBuilder().build();
     } catch (ODataJPARuntimeException e) {
@@ -199,8 +192,7 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
     assertEquals(objComplexType.pUnitName, "salesorderprocessing");
   }
 
-  private class JPAEdmMetaModel extends JPAMetaModelMock
-  {
+  private class JPAEdmMetaModel extends JPAMetaModelMock {
     Set<EmbeddableType<?>> embeddableSet;
 
     public JPAEdmMetaModel() {
@@ -216,14 +208,12 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class JPAEdmEmbeddable<String> extends JPAEmbeddableMock<String>
-  {
+  private class JPAEdmEmbeddable<String> extends JPAEmbeddableMock<String> {
 
     Set<Attribute<? super String, ?>> attributeSet = new HashSet<Attribute<? super String, ?>>();
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    private void setValuesToSet()
-    {
+    private void setValuesToSet() {
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
     }
@@ -243,8 +233,7 @@ public class JPAEdmComplexTypeTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String>
-  {
+  private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String> {
 
     @Override
     public PersistentAttributeType getPersistentAttributeType() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
index 11a011e..0f40e52 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityContainerTest.java
@@ -31,9 +31,6 @@ import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.provider.Schema;
 import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
@@ -46,6 +43,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEntityTypeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPASingularAttributeMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmEntityContainerTest extends JPAEdmTestModelView {
 
@@ -162,8 +161,7 @@ public class JPAEdmEntityContainerTest extends JPAEdmTestModelView {
     };
   }
 
-  private class JPAEdmMetaModel extends JPAMetaModelMock
-  {
+  private class JPAEdmMetaModel extends JPAMetaModelMock {
     Set<EntityType<?>> entities;
 
     public JPAEdmMetaModel() {
@@ -189,8 +187,7 @@ public class JPAEdmEntityContainerTest extends JPAEdmTestModelView {
     Set<Attribute<? super String, ?>> attributeSet = new HashSet<Attribute<? super String, ?>>();
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    private void setValuesToSet()
-    {
+    private void setValuesToSet() {
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
     }
@@ -201,8 +198,7 @@ public class JPAEdmEntityContainerTest extends JPAEdmTestModelView {
       return attributeSet;
     }
 
-    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String>
-    {
+    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String> {
 
       @Override
       public PersistentAttributeType getPersistentAttributeType() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
index 76e0342..cd47154 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntitySetTest.java
@@ -31,9 +31,6 @@ import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.provider.Schema;
 import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
@@ -46,6 +43,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEntityTypeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPASingularAttributeMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmEntitySetTest extends JPAEdmTestModelView {
 
@@ -153,8 +152,7 @@ public class JPAEdmEntitySetTest extends JPAEdmTestModelView {
     Set<Attribute<? super String, ?>> attributeSet = new HashSet<Attribute<? super String, ?>>();
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    private void setValuesToSet()
-    {
+    private void setValuesToSet() {
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
     }
@@ -170,8 +168,7 @@ public class JPAEdmEntitySetTest extends JPAEdmTestModelView {
       return attributeSet;
     }
 
-    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String>
-    {
+    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String> {
 
       @Override
       public PersistentAttributeType getPersistentAttributeType() {
@@ -204,8 +201,7 @@ public class JPAEdmEntitySetTest extends JPAEdmTestModelView {
     }
   }
 
-  private class JPAEdmMetaModel extends JPAMetaModelMock
-  {
+  private class JPAEdmMetaModel extends JPAMetaModelMock {
     Set<EntityType<?>> entities;
 
     public JPAEdmMetaModel() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
index 0f09637..a2e6b19 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmEntityTypeTest.java
@@ -30,9 +30,6 @@ import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
@@ -43,6 +40,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEntityTypeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPASingularAttributeMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmEntityTypeTest extends JPAEdmTestModelView {
 
@@ -127,8 +126,7 @@ public class JPAEdmEntityTypeTest extends JPAEdmTestModelView {
     return this;
   }
 
-  private class JPAEdmMetaModel extends JPAMetaModelMock
-  {
+  private class JPAEdmMetaModel extends JPAMetaModelMock {
     Set<EntityType<?>> entities;
 
     public JPAEdmMetaModel() {
@@ -154,8 +152,7 @@ public class JPAEdmEntityTypeTest extends JPAEdmTestModelView {
     Set<Attribute<? super String, ?>> attributeSet = new HashSet<Attribute<? super String, ?>>();
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    private void setValuesToSet()
-    {
+    private void setValuesToSet() {
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
     }
@@ -166,8 +163,7 @@ public class JPAEdmEntityTypeTest extends JPAEdmTestModelView {
       return attributeSet;
     }
 
-    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String>
-    {
+    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String> {
 
       @Override
       public PersistentAttributeType getPersistentAttributeType() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
index edc12d0..f5de641 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmFunctionImportTest.java
@@ -26,9 +26,6 @@ import static org.junit.Assert.fail;
 import java.util.HashMap;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.annotation.edm.Parameter.Mode;
 import org.apache.olingo.odata2.api.edm.EdmFacets;
 import org.apache.olingo.odata2.api.edm.EdmMultiplicity;
@@ -51,6 +48,8 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.ODataJPAContextMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPACustomProcessorMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPACustomProcessorNegativeMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
   private static final int METHOD_COUNT = 6;
@@ -71,8 +70,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 1);
     for (FunctionImport functionImport : functionImportList) {
@@ -81,15 +79,13 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       Mapping mapping = new Mapping();
       mapping.setInternalName("method1");
 
-      assertEquals(mapping.getInternalName(), functionImport.getMapping()
-          .getInternalName());
+      assertEquals(mapping.getInternalName(), functionImport.getMapping().getInternalName());
 
       ReturnType returnType = functionImport.getReturnType();
       assertNotNull(returnType);
       assertEquals(EdmMultiplicity.MANY, returnType.getMultiplicity());
 
-      List<FunctionImportParameter> funcImpList = functionImport
-          .getParameters();
+      List<FunctionImportParameter> funcImpList = functionImport.getParameters();
       assertEquals(2, funcImpList.size());
       assertEquals("Param1", funcImpList.get(0).getName());
       assertEquals(EdmSimpleTypeKind.String, funcImpList.get(0).getType());
@@ -112,8 +108,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 0);
 
@@ -128,8 +123,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(METHOD_COUNT, functionImportList.size());
 
@@ -145,8 +139,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 1);
 
@@ -157,8 +150,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
     ReturnType returnType = functionImport.getReturnType();
     assertNotNull(returnType);
     assertEquals(EdmMultiplicity.ONE, returnType.getMultiplicity());
-    assertEquals(returnType.getTypeName().toString(),
-        EdmSimpleTypeKind.Int32.getFullQualifiedName().toString());
+    assertEquals(returnType.getTypeName().toString(), EdmSimpleTypeKind.Int32.getFullQualifiedName().toString());
   }
 
   /**
@@ -170,8 +162,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 0);
 
@@ -195,8 +186,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(ODataJPAModelException.FUNC_ENTITYSET_EXP.getKey(), e
-          .getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.FUNC_ENTITYSET_EXP.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -214,8 +204,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.getKey(),
-          e.getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -231,8 +220,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 1);
 
@@ -245,9 +233,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
     ReturnType returnType = functionImport.getReturnType();
     assertNotNull(returnType);
     assertEquals(EdmMultiplicity.ONE, returnType.getMultiplicity());
-    assertEquals(returnType.getTypeName().toString(),
-        ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "."
-            + JPACustomProcessorMock.edmName);
+    assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "." + JPACustomProcessorMock.edmName);
   }
 
   /**
@@ -262,10 +248,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(
-          ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND
-              .getKey(),
-          e.getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -281,8 +264,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 1);
 
@@ -293,9 +275,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
     ReturnType returnType = functionImport.getReturnType();
     assertNotNull(returnType);
     assertEquals(EdmMultiplicity.ONE, returnType.getMultiplicity());
-    assertEquals(returnType.getTypeName().toString(),
-        ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "."
-            + JPACustomProcessorMock.edmName);
+    assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "." + JPACustomProcessorMock.edmName);
 
   }
 
@@ -309,8 +289,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 1);
 
@@ -321,9 +300,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
     ReturnType returnType = functionImport.getReturnType();
     assertNotNull(returnType);
     assertEquals(EdmMultiplicity.MANY, returnType.getMultiplicity());
-    assertEquals(returnType.getTypeName().toString(),
-        ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "."
-            + JPACustomProcessorMock.edmName);
+    assertEquals(returnType.getTypeName().toString(), ODataJPAContextMock.PERSISTENCE_UNIT_NAME + "." + JPACustomProcessorMock.edmName);
 
   }
 
@@ -339,10 +316,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(
-          ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND
-              .getKey(),
-          e.getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_ENTITY_NOT_FOUND.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -360,8 +334,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(ODataJPAModelException.TYPE_NOT_SUPPORTED.getKey(), e
-          .getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.TYPE_NOT_SUPPORTED.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -379,8 +352,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(ODataJPAModelException.FUNC_PARAM_NAME_EXP.getKey(), e
-          .getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.FUNC_PARAM_NAME_EXP.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -396,13 +368,11 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 1);
 
-    List<FunctionImportParameter> funcImpParamList = functionImportList
-        .get(0).getParameters();
+    List<FunctionImportParameter> funcImpParamList = functionImportList.get(0).getParameters();
     EdmFacets facets = funcImpParamList.get(0).getFacets();
     assertNotNull(facets);
     assertEquals(2, facets.getMaxLength().intValue());
@@ -425,13 +395,11 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 1);
 
-    List<FunctionImportParameter> funcImpParamList = functionImportList
-        .get(0).getParameters();
+    List<FunctionImportParameter> funcImpParamList = functionImportList.get(0).getParameters();
     EdmFacets facets = funcImpParamList.get(0).getFacets();
     assertNotNull(facets);
     assertNull(facets.getMaxLength());
@@ -453,8 +421,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.getKey(), e
-          .getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -473,8 +440,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
       jpaEdmfunctionImport.getBuilder().build();
       fail("Exception Expected");
     } catch (ODataJPAModelException e) {
-      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.getKey(), e
-          .getMessageReference().getKey());
+      assertEquals(ODataJPAModelException.FUNC_RETURN_TYPE_EXP.getKey(), e.getMessageReference().getKey());
     } catch (ODataJPARuntimeException e) {
       fail("Model Exception Expected");
     }
@@ -487,8 +453,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
     build();
 
-    List<FunctionImport> functionImportList = jpaEdmfunctionImport
-        .getConsistentFunctionImportList();
+    List<FunctionImport> functionImportList = jpaEdmfunctionImport.getConsistentFunctionImportList();
 
     assertEquals(functionImportList.size(), 0);
 
@@ -496,8 +461,7 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
 
   @Test
   public void testGetBuilderIdempotent() {
-    JPAEdmFunctionImport jpaEdmfunctionImport = new JPAEdmFunctionImport(
-        this);
+    JPAEdmFunctionImport jpaEdmfunctionImport = new JPAEdmFunctionImport(this);
 
     JPAEdmBuilder builder1 = jpaEdmfunctionImport.getBuilder();
     JPAEdmBuilder builder2 = jpaEdmfunctionImport.getBuilder();
@@ -511,58 +475,41 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
     HashMap<Class<?>, String[]> customOperations = new HashMap<Class<?>, String[]>();
 
     if (VARIANT == 0) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method1" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method1" });
     } else if (VARIANT == 1) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "XYX" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "XYX" });
     } else if (VARIANT == 2) {
       customOperations.put(JPACustomProcessorMock.class, null);
     } else if (VARIANT == 3) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method3" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method3" });
     } else if (VARIANT == 4) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method4" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method4" });
     } else if (VARIANT == 5) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method5" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method5" });
     } else if (VARIANT == 6) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method6" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method6" });
     } else if (VARIANT == 7) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method7" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method7" });
     } else if (VARIANT == 8) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method8" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method8" });
     } else if (VARIANT == 9) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method9" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method9" });
     } else if (VARIANT == 10) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method10" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method10" });
     } else if (VARIANT == 11) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method11" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method11" });
     } else if (VARIANT == 12) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method12" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method12" });
     } else if (VARIANT == 13) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method13" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method13" });
     } else if (VARIANT == 14) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method1" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method1" });
     } else if (VARIANT == 15) {
-      customOperations.put(JPACustomProcessorMock.class,
-          new String[] { "method3" });
+      customOperations.put(JPACustomProcessorMock.class, new String[] { "method3" });
     } else if (VARIANT == 16) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method16" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method16" });
     } else if (VARIANT == 17) {
-      customOperations.put(JPACustomProcessorNegativeMock.class,
-          new String[] { "method17" });
+      customOperations.put(JPACustomProcessorNegativeMock.class, new String[] { "method17" });
     } else {
       return null;
     }
@@ -617,11 +564,9 @@ public class JPAEdmFunctionImportTest extends JPAEdmTestModelView {
     try {
       jpaEdmfunctionImport.getBuilder().build();
     } catch (ODataJPAModelException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
index 80be3ce..191d247 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmKeyTest.java
@@ -26,9 +26,6 @@ import java.util.List;
 
 import javax.persistence.metamodel.Attribute;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
@@ -45,6 +42,8 @@ import org.apache.olingo.odata2.processor.core.jpa.mock.ODataJPAContextMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAAttributeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEdmMockData;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEdmMockData.ComplexType.ComplexTypeA;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPAEdmKeyTest extends JPAEdmTestModelView {
 
@@ -58,8 +57,7 @@ public class JPAEdmKeyTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class JPAAttributeA<Object, ComplexTypeA> extends
-      JPAAttributeMock<Object, ComplexTypeA> {
+  private class JPAAttributeA<Object, ComplexTypeA> extends JPAAttributeMock<Object, ComplexTypeA> {
     @SuppressWarnings("unchecked")
     @Override
     public Class<ComplexTypeA> getJavaType() {
@@ -79,18 +77,10 @@ public class JPAEdmKeyTest extends JPAEdmTestModelView {
 
     Key key = keyView.getEdmKey();
 
-    assertEquals(
-        JPAEdmMockData.ComplexType.ComplexTypeA.Property.PROPERTY_A,
-        key.getKeys().get(0).getName());
-    assertEquals(
-        JPAEdmMockData.ComplexType.ComplexTypeA.Property.PROPERTY_B,
-        key.getKeys().get(1).getName());
-    assertEquals(
-        JPAEdmMockData.ComplexType.ComplexTypeB.Property.PROPERTY_D,
-        key.getKeys().get(2).getName());
-    assertEquals(
-        JPAEdmMockData.ComplexType.ComplexTypeB.Property.PROPERTY_E,
-        key.getKeys().get(3).getName());
+    assertEquals(JPAEdmMockData.ComplexType.ComplexTypeA.Property.PROPERTY_A, key.getKeys().get(0).getName());
+    assertEquals(JPAEdmMockData.ComplexType.ComplexTypeA.Property.PROPERTY_B, key.getKeys().get(1).getName());
+    assertEquals(JPAEdmMockData.ComplexType.ComplexTypeB.Property.PROPERTY_D, key.getKeys().get(2).getName());
+    assertEquals(JPAEdmMockData.ComplexType.ComplexTypeB.Property.PROPERTY_E, key.getKeys().get(3).getName());
 
   }
 
@@ -117,8 +107,7 @@ public class JPAEdmKeyTest extends JPAEdmTestModelView {
   public ComplexType searchEdmComplexType(final String arg0) {
     if (arg0.equals(JPAEdmMockData.ComplexType.ComplexTypeA.class.getName())) {
       return buildComplexTypeA();
-    } else if (arg0.equals(JPAEdmMockData.ComplexType.ComplexTypeB.class
-        .getSimpleName())) {
+    } else if (arg0.equals(JPAEdmMockData.ComplexType.ComplexTypeB.class.getSimpleName())) {
       return buildComplexTypeB();
     }
 
@@ -175,10 +164,8 @@ public class JPAEdmKeyTest extends JPAEdmTestModelView {
     propertyList.add(property);
 
     ComplexProperty complexProperty = new ComplexProperty();
-    complexProperty
-        .setName(JPAEdmMockData.ComplexType.ComplexTypeA.Property.PROPERTY_C);
-    complexProperty.setType(new FullQualifiedName(ODataJPAContextMock.NAMESPACE,
-        JPAEdmMockData.ComplexType.ComplexTypeB.name));
+    complexProperty.setName(JPAEdmMockData.ComplexType.ComplexTypeA.Property.PROPERTY_C);
+    complexProperty.setType(new FullQualifiedName(ODataJPAContextMock.NAMESPACE, JPAEdmMockData.ComplexType.ComplexTypeB.name));
 
     propertyList.add(complexProperty);
     return propertyList;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
index 7f732c7..bf8b9ed 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmModelTest.java
@@ -28,15 +28,14 @@ import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EmbeddableType;
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEmbeddableMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPASingularAttributeMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmModelTest extends JPAEdmTestModelView {
 
@@ -69,8 +68,7 @@ public class JPAEdmModelTest extends JPAEdmTestModelView {
     return new JPAEdmMetaModel();
   }
 
-  private class JPAEdmMetaModel extends JPAMetaModelMock
-  {
+  private class JPAEdmMetaModel extends JPAMetaModelMock {
     Set<EmbeddableType<?>> embeddableSet;
 
     public JPAEdmMetaModel() {
@@ -86,14 +84,12 @@ public class JPAEdmModelTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class JPAEdmEmbeddable<String> extends JPAEmbeddableMock<String>
-  {
+  private class JPAEdmEmbeddable<String> extends JPAEmbeddableMock<String> {
 
     Set<Attribute<? super String, ?>> attributeSet = new HashSet<Attribute<? super String, ?>>();
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
-    private void setValuesToSet()
-    {
+    private void setValuesToSet() {
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
       attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
     }
@@ -113,8 +109,7 @@ public class JPAEdmModelTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String>
-  {
+  private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String> {
 
     @Override
     public PersistentAttributeType getPersistentAttributeType() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
index 17c1984..10c900b 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmNavigationPropertyTest.java
@@ -26,9 +26,6 @@ import static org.junit.Assert.fail;
 import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.EntityType;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
 import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
@@ -39,6 +36,8 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAAttributeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEntityTypeMock;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
 
@@ -49,8 +48,7 @@ public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
   public static void setup() {
     JPAEdmNavigationPropertyTest localView = new JPAEdmNavigationPropertyTest();
     navPropView = new JPAEdmNavigationPropertyTest();
-    objNavigationProperty = new JPAEdmNavigationProperty(localView,
-        localView, 1);
+    objNavigationProperty = new JPAEdmNavigationProperty(localView, localView, 1);
     try {
       objNavigationProperty.getBuilder().build();
     } catch (ODataJPAModelException e) {
@@ -90,13 +88,8 @@ public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
 
     Association association = new Association();
     association.setName("Assoc_SalesOrderHeader_SalesOrderItem");
-    association.setEnd1(new AssociationEnd().setType(
-        new FullQualifiedName("salesorderprocessing", "String"))
-        .setRole("SalesOrderHeader"));
-    association.setEnd2(new AssociationEnd()
-        .setType(
-            new FullQualifiedName("salesorderprocessing",
-                "SalesOrderItem")).setRole("SalesOrderItem"));
+    association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole("SalesOrderHeader"));
+    association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")).setRole("SalesOrderItem"));
     return association;
   }
 
@@ -119,8 +112,7 @@ public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
     if (objNavigationProperty == null || objNavigationProperty.getEdmNavigationProperty() == null) {
       JPAEdmNavigationPropertyTest localView = new JPAEdmNavigationPropertyTest();
       navPropView = new JPAEdmNavigationPropertyTest();
-      objNavigationProperty = new JPAEdmNavigationProperty(localView,
-          localView, 1);
+      objNavigationProperty = new JPAEdmNavigationProperty(localView, localView, 1);
       try {
         objNavigationProperty.getBuilder().build();
       } catch (ODataJPAModelException e) {
@@ -129,23 +121,19 @@ public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
         fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
-    assertEquals(
-        objNavigationProperty.getEdmNavigationProperty().getName(),
-        "StringDetails");
+    assertEquals(objNavigationProperty.getEdmNavigationProperty().getName(), "StringDetails");
   }
 
   @Test
   public void testGetConsistentEdmNavigationProperties() {
-    assertTrue(objNavigationProperty.getConsistentEdmNavigationProperties()
-        .size() > 0);
+    assertTrue(objNavigationProperty.getConsistentEdmNavigationProperties().size() > 0);
   }
 
   @Test
   public void testAddJPAEdmNavigationPropertyView() {
     JPAEdmNavigationPropertyTest localView = new JPAEdmNavigationPropertyTest();
     navPropView = new JPAEdmNavigationPropertyTest();
-    objNavigationProperty = new JPAEdmNavigationProperty(localView,
-        localView, 1);
+    objNavigationProperty = new JPAEdmNavigationProperty(localView, localView, 1);
     try {
       objNavigationProperty.getBuilder().build();
     } catch (ODataJPAModelException e) {
@@ -154,8 +142,7 @@ public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     objNavigationProperty.addJPAEdmNavigationPropertyView(navPropView);
-    assertTrue(objNavigationProperty.getConsistentEdmNavigationProperties()
-        .size() > 1);
+    assertTrue(objNavigationProperty.getConsistentEdmNavigationProperties().size() > 1);
   }
 
   @Override
@@ -173,16 +160,13 @@ public class JPAEdmNavigationPropertyTest extends JPAEdmTestModelView {
     } catch (ODataJPAModelException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
-    assertEquals(objNavigationProperty.getEdmNavigationProperty()
-        .getFromRole(), "SalesOrderItem");
-    assertEquals(objNavigationProperty.getEdmNavigationProperty()
-        .getToRole(), "SalesOrderHeader");
+    assertEquals(objNavigationProperty.getEdmNavigationProperty().getFromRole(), "SalesOrderItem");
+    assertEquals(objNavigationProperty.getEdmNavigationProperty().getToRole(), "SalesOrderHeader");
 
   }
 
   @SuppressWarnings("hiding")
-  private class AttributeMock<Object, String> extends
-      JPAAttributeMock<Object, String> {
+  private class AttributeMock<Object, String> extends JPAAttributeMock<Object, String> {
 
     @SuppressWarnings("unchecked")
     @Override

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
index 4313f8e..70c40bc 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmPropertyTest.java
@@ -33,9 +33,6 @@ import javax.persistence.metamodel.EmbeddableType;
 import javax.persistence.metamodel.EntityType;
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
 import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
@@ -54,6 +51,8 @@ import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEmbeddableTypeM
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEntityTypeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPASingularAttributeMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmPropertyTest extends JPAEdmTestModelView {
 
@@ -82,8 +81,7 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
 
     // builder for complex type
     objJPAEdmPropertyTest = new JPAEdmPropertyTest();
-    objJPAEdmProperty = new JPAEdmProperty(objJPAEdmPropertyTest,
-        objJPAEdmPropertyTest);
+    objJPAEdmProperty = new JPAEdmProperty(objJPAEdmPropertyTest, objJPAEdmPropertyTest);
     try {
       objJPAEdmProperty.getBuilder().build();
     } catch (ODataJPAModelException e) {
@@ -208,10 +206,8 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
   @Override
   public Association getEdmAssociation() {
     Association association = new Association();
-    association.setEnd1(new AssociationEnd().setType(new FullQualifiedName(
-        "salesorderprocessing", "SalesOrderHeader")));
-    association.setEnd2(new AssociationEnd().setType(new FullQualifiedName(
-        "salesorderprocessing", "String")));
+    association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader")));
+    association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")));
 
     return association;
   }
@@ -271,12 +267,8 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private void setValuesToSet() {
-      attributeSet
-          .add((Attribute<? super String, String>) new JPAEdmAttribute(
-              java.lang.String.class, "SOID"));
-      attributeSet
-          .add((Attribute<? super String, String>) new JPAEdmAttribute(
-              java.lang.String.class, "SONAME"));
+      attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
+      attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
     }
 
     @Override
@@ -285,8 +277,7 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
       return attributeSet;
     }
 
-    private class JPAEdmAttribute<Object, String> extends
-        JPASingularAttributeMock<Object, String> {
+    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String> {
 
       @Override
       public PersistentAttributeType getPersistentAttributeType() {
@@ -326,19 +317,14 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class JPAEdmEmbeddable<String> extends
-      JPAEmbeddableTypeMock<String> {
+  private class JPAEdmEmbeddable<String> extends JPAEmbeddableTypeMock<String> {
 
     Set<Attribute<? super String, ?>> attributeSet = new HashSet<Attribute<? super String, ?>>();
 
     @SuppressWarnings({ "unchecked", "rawtypes" })
     private void setValuesToSet() {
-      attributeSet
-          .add((Attribute<? super String, String>) new JPAEdmAttribute(
-              java.lang.String.class, "SOID"));
-      attributeSet
-          .add((Attribute<? super String, String>) new JPAEdmAttribute(
-              java.lang.String.class, "SONAME"));
+      attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SOID"));
+      attributeSet.add((Attribute<? super String, String>) new JPAEdmAttribute(java.lang.String.class, "SONAME"));
     }
 
     @Override
@@ -359,8 +345,7 @@ public class JPAEdmPropertyTest extends JPAEdmTestModelView {
       return (Class<String>) clazz;
     }
 
-    private class JPAEdmAttribute<Object, String> extends
-        JPASingularAttributeMock<Object, String> {
+    private class JPAEdmAttribute<Object, String> extends JPASingularAttributeMock<Object, String> {
 
       @Override
       public PersistentAttributeType getPersistentAttributeType() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
index 62dbfa0..d49c885 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintRoleTest.java
@@ -33,10 +33,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.ManagedType;
 
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
 import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
@@ -51,6 +47,9 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAAttributeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAJavaMemberMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAManagedTypeMock;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
 
@@ -61,10 +60,7 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
   public void setUp() {
     objJPAEdmReferentialConstraintRoleTest = new JPAEdmReferentialConstraintRoleTest();
 
-    objJPAEdmReferentialConstraintRole = new JPAEdmReferentialConstraintRole(
-        RoleType.PRINCIPAL, objJPAEdmReferentialConstraintRoleTest,
-        objJPAEdmReferentialConstraintRoleTest,
-        objJPAEdmReferentialConstraintRoleTest);
+    objJPAEdmReferentialConstraintRole = new JPAEdmReferentialConstraintRole(RoleType.PRINCIPAL, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest);
 
     try {
       objJPAEdmReferentialConstraintRole.getBuilder().build();
@@ -87,27 +83,21 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
 
   @Test
   public void testGetBuilderIdempotent() {
-    JPAEdmBuilder builder1 = objJPAEdmReferentialConstraintRole
-        .getBuilder();
-    JPAEdmBuilder builder2 = objJPAEdmReferentialConstraintRole
-        .getBuilder();
+    JPAEdmBuilder builder1 = objJPAEdmReferentialConstraintRole.getBuilder();
+    JPAEdmBuilder builder2 = objJPAEdmReferentialConstraintRole.getBuilder();
 
     assertEquals(builder1.hashCode(), builder2.hashCode());
   }
 
   @Test
   public void testGetRoleTypePrincipal() {
-    assertEquals(objJPAEdmReferentialConstraintRole.getRoleType(),
-        RoleType.PRINCIPAL);
+    assertEquals(objJPAEdmReferentialConstraintRole.getRoleType(), RoleType.PRINCIPAL);
   }
 
   @Test
   public void testGetRoleTypeDependent() {
     objJPAEdmReferentialConstraintRoleTest = new JPAEdmReferentialConstraintRoleTest();
-    objJPAEdmReferentialConstraintRole = new JPAEdmReferentialConstraintRole(
-        RoleType.DEPENDENT, objJPAEdmReferentialConstraintRoleTest,
-        objJPAEdmReferentialConstraintRoleTest,
-        objJPAEdmReferentialConstraintRoleTest);
+    objJPAEdmReferentialConstraintRole = new JPAEdmReferentialConstraintRole(RoleType.DEPENDENT, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest, objJPAEdmReferentialConstraintRoleTest);
 
     try {
       objJPAEdmReferentialConstraintRole.getBuilder().build();
@@ -117,8 +107,7 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
     } catch (ODataJPARuntimeException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
-    assertEquals(objJPAEdmReferentialConstraintRole.getRoleType(),
-        RoleType.DEPENDENT);
+    assertEquals(objJPAEdmReferentialConstraintRole.getRoleType(), RoleType.DEPENDENT);
   }
 
   @Test
@@ -130,8 +119,7 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
     } catch (ODataJPARuntimeException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
-    assertNotNull(objJPAEdmReferentialConstraintRole
-        .getEdmReferentialConstraintRole());
+    assertNotNull(objJPAEdmReferentialConstraintRole.getEdmReferentialConstraintRole());
   }
 
   @Test
@@ -158,13 +146,8 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
   public Association getEdmAssociation() {
     Association association = new Association();
     association.setName("Assoc_SalesOrderHeader_SalesOrderItem");
-    association.setEnd1(new AssociationEnd().setType(
-        new FullQualifiedName("salesorderprocessing", "String"))
-        .setRole("SalesOrderHeader"));
-    association.setEnd2(new AssociationEnd()
-        .setType(
-            new FullQualifiedName("salesorderprocessing",
-                "SalesOrderItem")).setRole("SalesOrderItem"));
+    association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole("SalesOrderHeader"));
+    association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")).setRole("SalesOrderItem"));
     return association;
   }
 
@@ -194,8 +177,7 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class AttributeMock<Object, String> extends
-      JPAAttributeMock<Object, String> {
+  private class AttributeMock<Object, String> extends JPAAttributeMock<Object, String> {
 
     @Override
     public Member getJavaMember() {
@@ -235,8 +217,7 @@ public class JPAEdmReferentialConstraintRoleTest extends JPAEdmTestModelView {
     @Override
     public <T extends Annotation> T getAnnotation(final Class<T> annotationClass) {
       JoinColumn joinColumn = EasyMock.createMock(JoinColumn.class);
-      EasyMock.expect(joinColumn.referencedColumnName())
-          .andReturn("SOID");
+      EasyMock.expect(joinColumn.referencedColumnName()).andReturn("SOID");
       EasyMock.expect(joinColumn.name()).andReturn("SOID");
 
       EasyMock.replay(joinColumn);


[16/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/TestUtil.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/TestUtil.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/TestUtil.java
index f238a99..a30d1b3 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/TestUtil.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/data/TestUtil.java
@@ -27,8 +27,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.easymock.EasyMock;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -45,17 +43,16 @@ import org.apache.olingo.odata2.api.uri.ExpandSelectTreeNode;
 import org.apache.olingo.odata2.api.uri.NavigationPropertySegment;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.cud.SalesOrderLineItem;
+import org.easymock.EasyMock;
 
 public class TestUtil {
 
   public static ExpandSelectTreeNode mockExpandSelectTreeNode() {
-    ExpandSelectTreeNode nextExpandNode = EasyMock
-        .createMock(ExpandSelectTreeNode.class);
+    ExpandSelectTreeNode nextExpandNode = EasyMock.createMock(ExpandSelectTreeNode.class);
     Map<String, ExpandSelectTreeNode> nextLink = null;
     EasyMock.expect(nextExpandNode.getLinks()).andStubReturn(nextLink);
     EasyMock.replay(nextExpandNode);
-    ExpandSelectTreeNode expandNode = EasyMock
-        .createMock(ExpandSelectTreeNode.class);
+    ExpandSelectTreeNode expandNode = EasyMock.createMock(ExpandSelectTreeNode.class);
     Map<String, ExpandSelectTreeNode> links = new HashMap<String, ExpandSelectTreeNode>();
     links.put("SalesOrderLineItemDetails", nextExpandNode);
     EasyMock.expect(expandNode.getLinks()).andStubReturn(links);
@@ -64,8 +61,7 @@ public class TestUtil {
   }
 
   public static ExpandSelectTreeNode mockCurrentExpandSelectTreeNode() {
-    ExpandSelectTreeNode expandNode = EasyMock
-        .createMock(ExpandSelectTreeNode.class);
+    ExpandSelectTreeNode expandNode = EasyMock.createMock(ExpandSelectTreeNode.class);
     Map<String, ExpandSelectTreeNode> links = new HashMap<String, ExpandSelectTreeNode>();
     EasyMock.expect(expandNode.getLinks()).andStubReturn(links);
     EasyMock.replay(expandNode);
@@ -86,15 +82,13 @@ public class TestUtil {
     try {
       selfLink = new URI("SalesOrders(2L)/SalesOrderLineItemDetails");
       writeContext.setSelfLink(selfLink);
-      writeContext
-          .setCurrentExpandSelectTreeNode(mockCurrentExpandSelectTreeNode());
+      writeContext.setCurrentExpandSelectTreeNode(mockCurrentExpandSelectTreeNode());
       writeContext.setNavigationProperty(mockNavigationProperty());
       writeContext.setSourceEntitySet(mockSourceEntitySet());
       writeContext.setEntryData(getFeedData());
 
     } catch (URISyntaxException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
     return writeContext;
@@ -102,8 +96,7 @@ public class TestUtil {
 
   public static WriteEntryCallbackContext getWriteEntryCallBackContext() {
     WriteEntryCallbackContext writeContext = new WriteEntryCallbackContext();
-    writeContext
-        .setCurrentExpandSelectTreeNode(mockCurrentExpandSelectTreeNode());
+    writeContext.setCurrentExpandSelectTreeNode(mockCurrentExpandSelectTreeNode());
     writeContext.setNavigationProperty(mockNavigationProperty());
     writeContext.setSourceEntitySet(mockSourceEntitySet());
     writeContext.setEntryData(getEntryData());
@@ -113,11 +106,9 @@ public class TestUtil {
   private static EdmEntitySet mockSourceEntitySet() {
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     try {
-      EasyMock.expect(entitySet.getEntityType()).andStubReturn(
-          mockSourceEdmEntityType());
+      EasyMock.expect(entitySet.getEntityType()).andStubReturn(mockSourceEdmEntityType());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entitySet);
     return entitySet;
@@ -132,27 +123,19 @@ public class TestUtil {
     propertyNames.add("description");
     navigationPropertyNames.add("SalesOrderLineItemDetails");
     try {
-      EasyMock.expect(mapping.getInternalName()).andStubReturn(
-          "SalesOrderHeader");
+      EasyMock.expect(mapping.getInternalName()).andStubReturn("SalesOrderHeader");
       EasyMock.replay(mapping);
-      EasyMock.expect(entityType.getName()).andStubReturn(
-          "SalesOrderHeader");
+      EasyMock.expect(entityType.getName()).andStubReturn("SalesOrderHeader");
       EasyMock.expect(entityType.getMapping()).andStubReturn(mapping);
-      EasyMock.expect(entityType.getNavigationPropertyNames())
-          .andStubReturn(navigationPropertyNames);
-      EasyMock.expect(entityType.getProperty("SalesOrderLineItemDetails"))
-          .andStubReturn(mockNavigationProperty());
+      EasyMock.expect(entityType.getNavigationPropertyNames()).andStubReturn(navigationPropertyNames);
+      EasyMock.expect(entityType.getProperty("SalesOrderLineItemDetails")).andStubReturn(mockNavigationProperty());
       EdmProperty property1 = mockEdmPropertyOfSource1();
-      EasyMock.expect(entityType.getProperty("id")).andStubReturn(
-          property1);
-      EasyMock.expect(entityType.getProperty("description"))
-          .andStubReturn(mockEdmPropertyOfSource2());
-      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(
-          propertyNames);
+      EasyMock.expect(entityType.getProperty("id")).andStubReturn(property1);
+      EasyMock.expect(entityType.getProperty("description")).andStubReturn(mockEdmPropertyOfSource2());
+      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entityType);
     return entityType;
@@ -171,8 +154,7 @@ public class TestUtil {
       EasyMock.expect(edmProperty.getType()).andStubReturn(type);
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(mapping);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmProperty);
     return edmProperty;
@@ -191,8 +173,7 @@ public class TestUtil {
       EasyMock.expect(edmProperty.getType()).andStubReturn(type);
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(mapping);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmProperty);
     return edmProperty;
@@ -218,46 +199,33 @@ public class TestUtil {
   }
 
   private static NavigationPropertySegment mockNavigationPropertySegment() {
-    NavigationPropertySegment navigationPropSegment = EasyMock
-        .createMock(NavigationPropertySegment.class);
-    EasyMock.expect(navigationPropSegment.getNavigationProperty())
-        .andStubReturn(mockNavigationProperty());
-    EasyMock.expect(navigationPropSegment.getTargetEntitySet())
-        .andStubReturn(mockTargetEntitySet());
+    NavigationPropertySegment navigationPropSegment = EasyMock.createMock(NavigationPropertySegment.class);
+    EasyMock.expect(navigationPropSegment.getNavigationProperty()).andStubReturn(mockNavigationProperty());
+    EasyMock.expect(navigationPropSegment.getTargetEntitySet()).andStubReturn(mockTargetEntitySet());
     EasyMock.replay(navigationPropSegment);
     return navigationPropSegment;
   }
 
-  public static NavigationPropertySegment mockThirdNavigationPropertySegment()
-  {
-    NavigationPropertySegment navigationPropSegment = EasyMock
-        .createMock(NavigationPropertySegment.class);
-    EasyMock.expect(navigationPropSegment.getNavigationProperty())
-        .andStubReturn(mockSecondNavigationProperty());
-    EasyMock.expect(navigationPropSegment.getTargetEntitySet())
-        .andStubReturn(mockThirdEntitySet());
+  public static NavigationPropertySegment mockThirdNavigationPropertySegment() {
+    NavigationPropertySegment navigationPropSegment = EasyMock.createMock(NavigationPropertySegment.class);
+    EasyMock.expect(navigationPropSegment.getNavigationProperty()).andStubReturn(mockSecondNavigationProperty());
+    EasyMock.expect(navigationPropSegment.getTargetEntitySet()).andStubReturn(mockThirdEntitySet());
     EasyMock.replay(navigationPropSegment);
     return navigationPropSegment;
   }
 
   public static EdmNavigationProperty mockSecondNavigationProperty() {
-    EdmNavigationProperty navigationProperty = EasyMock
-        .createMock(EdmNavigationProperty.class);
+    EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
     EdmMapping mapping = EasyMock.createMock(EdmMapping.class);
-    EasyMock.expect(mapping.getInternalName()).andStubReturn(
-        "materials");
+    EasyMock.expect(mapping.getInternalName()).andStubReturn("materials");
     EasyMock.replay(mapping);
     try {
-      EasyMock.expect(navigationProperty.getMultiplicity())
-          .andStubReturn(EdmMultiplicity.ONE);
-      EasyMock.expect(navigationProperty.getMapping()).andStubReturn(
-          mapping);
-      EasyMock.expect(navigationProperty.getName()).andStubReturn(
-          "MaterialDetails");
+      EasyMock.expect(navigationProperty.getMultiplicity()).andStubReturn(EdmMultiplicity.ONE);
+      EasyMock.expect(navigationProperty.getMapping()).andStubReturn(mapping);
+      EasyMock.expect(navigationProperty.getName()).andStubReturn("MaterialDetails");
       EasyMock.expect(navigationProperty.getFromRole()).andStubReturn("SalesOrderLineItem");
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(navigationProperty);
     return navigationProperty;
@@ -266,11 +234,9 @@ public class TestUtil {
   public static EdmEntitySet mockTargetEntitySet() {
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     try {
-      EasyMock.expect(entitySet.getEntityType()).andStubReturn(
-          mockTargetEdmEntityType());
+      EasyMock.expect(entitySet.getEntityType()).andStubReturn(mockTargetEdmEntityType());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entitySet);
     return entitySet;
@@ -279,11 +245,9 @@ public class TestUtil {
   public static EdmEntitySet mockThirdEntitySet() {
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     try {
-      EasyMock.expect(entitySet.getEntityType()).andStubReturn(
-          mockThirdEdmEntityType());
+      EasyMock.expect(entitySet.getEntityType()).andStubReturn(mockThirdEdmEntityType());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entitySet);
     return entitySet;
@@ -297,21 +261,16 @@ public class TestUtil {
     List<String> propertyNames = new ArrayList<String>();
     propertyNames.add("price");
     try {
-      EasyMock.expect(mapping.getInternalName()).andStubReturn(
-          "Material");
+      EasyMock.expect(mapping.getInternalName()).andStubReturn("Material");
       EasyMock.replay(mapping);
-      EasyMock.expect(entityType.getName()).andStubReturn(
-          "Material");
+      EasyMock.expect(entityType.getName()).andStubReturn("Material");
       EasyMock.expect(entityType.getMapping()).andStubReturn(mapping);
       EdmProperty property = mockEdmPropertyOfTarget();
-      EasyMock.expect(entityType.getProperty("price")).andStubReturn(
-          property);
-      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(
-          propertyNames);
+      EasyMock.expect(entityType.getProperty("price")).andStubReturn(property);
+      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entityType);
     return entityType;
@@ -324,21 +283,16 @@ public class TestUtil {
     List<String> propertyNames = new ArrayList<String>();
     propertyNames.add("price");
     try {
-      EasyMock.expect(mapping.getInternalName()).andStubReturn(
-          "SalesOrderLineItem");
+      EasyMock.expect(mapping.getInternalName()).andStubReturn("SalesOrderLineItem");
       EasyMock.replay(mapping);
-      EasyMock.expect(entityType.getName()).andStubReturn(
-          "SalesOrderLineItem");
+      EasyMock.expect(entityType.getName()).andStubReturn("SalesOrderLineItem");
       EasyMock.expect(entityType.getMapping()).andStubReturn(mapping);
       EdmProperty property = mockEdmPropertyOfTarget();
-      EasyMock.expect(entityType.getProperty("price")).andStubReturn(
-          property);
-      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(
-          propertyNames);
+      EasyMock.expect(entityType.getProperty("price")).andStubReturn(property);
+      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entityType);
     return entityType;
@@ -358,31 +312,24 @@ public class TestUtil {
       EasyMock.expect(edmProperty.getType()).andStubReturn(type);
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(mapping);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmProperty);
     return edmProperty;
   }
 
   public static EdmNavigationProperty mockNavigationProperty() {
-    EdmNavigationProperty navigationProperty = EasyMock
-        .createMock(EdmNavigationProperty.class);
+    EdmNavigationProperty navigationProperty = EasyMock.createMock(EdmNavigationProperty.class);
     EdmMapping mapping = EasyMock.createMock(EdmMapping.class);
-    EasyMock.expect(mapping.getInternalName()).andStubReturn(
-        "salesOrderLineItems");
+    EasyMock.expect(mapping.getInternalName()).andStubReturn("salesOrderLineItems");
     EasyMock.replay(mapping);
     try {
-      EasyMock.expect(navigationProperty.getMultiplicity())
-          .andStubReturn(EdmMultiplicity.MANY);
-      EasyMock.expect(navigationProperty.getMapping()).andStubReturn(
-          mapping);
-      EasyMock.expect(navigationProperty.getName()).andStubReturn(
-          "SalesOrderLineItemDetails");
+      EasyMock.expect(navigationProperty.getMultiplicity()).andStubReturn(EdmMultiplicity.MANY);
+      EasyMock.expect(navigationProperty.getMapping()).andStubReturn(mapping);
+      EasyMock.expect(navigationProperty.getName()).andStubReturn("SalesOrderLineItemDetails");
       EasyMock.expect(navigationProperty.getFromRole()).andStubReturn("SalesOrderHeader");
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(navigationProperty);
     return navigationProperty;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
index e9b89dd..c8f1410 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmMappingModelServiceTest.java
@@ -26,11 +26,10 @@ import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 
+import org.apache.olingo.odata2.processor.core.jpa.mock.ODataJPAContextMock;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.olingo.odata2.processor.core.jpa.mock.ODataJPAContextMock;
-
 public class JPAEdmMappingModelServiceTest extends JPAEdmMappingModelService {
 
   private static JPAEdmMappingModelServiceTest objJPAEdmMappingModelServiceTest;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
index d94a192..b82ad5b 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPAEdmNameBuilderTest.java
@@ -21,9 +21,6 @@ package org.apache.olingo.odata2.processor.core.jpa.access.model;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
-import org.easymock.EasyMock;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView;
@@ -31,6 +28,8 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
 import org.apache.olingo.odata2.processor.core.jpa.ODataJPAContextImpl;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAAttributeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAEntityTypeMock;
+import org.easymock.EasyMock;
+import org.junit.Test;
 
 public class JPAEdmNameBuilderTest {
 
@@ -60,8 +59,7 @@ public class JPAEdmNameBuilderTest {
   }
 
   @SuppressWarnings("hiding")
-  class JAttribute<Object, String> extends JPAAttributeMock<Object, java.lang.String>
-  {
+  class JAttribute<Object, String> extends JPAAttributeMock<Object, java.lang.String> {
 
     @Override
     public java.lang.String getName() {
@@ -75,8 +73,7 @@ public class JPAEdmNameBuilderTest {
 
   }
 
-  class JEntityType<Object> extends JPAEntityTypeMock<Object>
-  {
+  class JEntityType<Object> extends JPAEntityTypeMock<Object> {
 
     @Override
     public java.lang.String getName() {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
index 7d0e9b1..27e4e6e 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/access/model/JPATypeConvertorTest.java
@@ -24,11 +24,10 @@ import static org.junit.Assert.fail;
 import java.math.BigDecimal;
 import java.util.UUID;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmSimpleTypeKind;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.junit.Test;
 
 public class JPATypeConvertorTest {
 
@@ -59,30 +58,19 @@ public class JPATypeConvertorTest {
     UUID uUID = new UUID(0, 0);
 
     try {
-      edmSimpleKindTypeString = JPATypeConvertor
-          .convertToEdmSimpleType(str.getClass(), null);
-      edmSimpleKindTypeByteArr = JPATypeConvertor
-          .convertToEdmSimpleType(byteArr.getClass(), null);
-      edmSimpleKindTypeLong = JPATypeConvertor
-          .convertToEdmSimpleType(longObj.getClass(), null);
-      edmSimpleKindTypeShort = JPATypeConvertor
-          .convertToEdmSimpleType(shortObj.getClass(), null);
-      edmSimpleKindTypeInteger = JPATypeConvertor
-          .convertToEdmSimpleType(integerObj.getClass(), null);
-      edmSimpleKindTypeDouble = JPATypeConvertor
-          .convertToEdmSimpleType(doubleObj.getClass(), null);
-      edmSimpleKindTypeFloat = JPATypeConvertor
-          .convertToEdmSimpleType(floatObj.getClass(), null);
-      edmSimpleKindTypeBigDecimal = JPATypeConvertor
-          .convertToEdmSimpleType(bigDecimalObj.getClass(), null);
-      edmSimpleKindTypeByte = JPATypeConvertor
-          .convertToEdmSimpleType(byteObj.getClass(), null);
-      edmSimpleKindTypeBoolean = JPATypeConvertor
-          .convertToEdmSimpleType(booleanObj.getClass(), null);
+      edmSimpleKindTypeString = JPATypeConvertor.convertToEdmSimpleType(str.getClass(), null);
+      edmSimpleKindTypeByteArr = JPATypeConvertor.convertToEdmSimpleType(byteArr.getClass(), null);
+      edmSimpleKindTypeLong = JPATypeConvertor.convertToEdmSimpleType(longObj.getClass(), null);
+      edmSimpleKindTypeShort = JPATypeConvertor.convertToEdmSimpleType(shortObj.getClass(), null);
+      edmSimpleKindTypeInteger = JPATypeConvertor.convertToEdmSimpleType(integerObj.getClass(), null);
+      edmSimpleKindTypeDouble = JPATypeConvertor.convertToEdmSimpleType(doubleObj.getClass(), null);
+      edmSimpleKindTypeFloat = JPATypeConvertor.convertToEdmSimpleType(floatObj.getClass(), null);
+      edmSimpleKindTypeBigDecimal = JPATypeConvertor.convertToEdmSimpleType(bigDecimalObj.getClass(), null);
+      edmSimpleKindTypeByte = JPATypeConvertor.convertToEdmSimpleType(byteObj.getClass(), null);
+      edmSimpleKindTypeBoolean = JPATypeConvertor.convertToEdmSimpleType(booleanObj.getClass(), null);
       /*edmSimpleKindTypeDate = JPATypeConvertor
       		.convertToEdmSimpleType(dateObj.getClass(),null);*/
-      edmSimpleKindTypeUUID = JPATypeConvertor
-          .convertToEdmSimpleType(uUID.getClass(), null);
+      edmSimpleKindTypeUUID = JPATypeConvertor.convertToEdmSimpleType(uUID.getClass(), null);
     } catch (ODataJPAModelException e) {
       fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequestTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequestTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequestTest.java
index 8e75313..8357df5 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequestTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPACreateRequestTest.java
@@ -31,8 +31,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmStructuralType;
 import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
@@ -45,6 +43,7 @@ import org.apache.olingo.odata2.core.ep.feed.ODataFeedImpl;
 import org.apache.olingo.odata2.core.uri.ExpandSelectTreeNodeImpl;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.junit.Test;
 
 public class JPACreateRequestTest {
 
@@ -59,34 +58,28 @@ public class JPACreateRequestTest {
       if (e.isCausedByMessageException()) {
         assertTrue(true);
       } else {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
 
   }
 
   @Test
-  public void testGetSetterName()
-  {
+  public void testGetSetterName() {
     JPACreateRequest createRequest = new JPACreateRequest();
     Method method = getMethodForTesting("getSetterName", createRequest);
-    if (method != null)
-    {
+    if (method != null) {
       method.setAccessible(true);
       Object[] actualParams = { "salesOrderItems" };
       try {
         String result = (String) method.invoke(createRequest, actualParams);
         assertEquals("setSalesOrderItems", result);
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
 
@@ -100,8 +93,7 @@ public class JPACreateRequestTest {
     try {
       result = createRequest.parse2JPAEntityValueMap(JPATestUtil.getJPAEntity(), edmEntityType, JPATestUtil.getPropertyValueMap(), "SalesOrderHeader");
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNotNull(result);
     assertEquals(((SalesOrderHeader) result).getId(), 1);
@@ -109,12 +101,10 @@ public class JPACreateRequestTest {
   }
 
   @Test
-  public void testCreateInlinedEntities()
-  {
+  public void testCreateInlinedEntities() {
     JPACreateRequest createRequest = new JPACreateRequest(JPATestUtil.mockMetaModel());
     Method method = getMethodForTesting("createInlinedEntities", createRequest);
-    if (method != null)
-    {
+    if (method != null) {
       method.setAccessible(true);
       EdmEntitySet edmEntitySet = JPATestUtil.mockSourceEdmEntitySet();
       ODataEntryImpl odataEntry = createODataEntry();
@@ -124,14 +114,11 @@ public class JPACreateRequestTest {
         method.invoke(createRequest, actualParams);
 
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
 
     }
@@ -139,12 +126,10 @@ public class JPACreateRequestTest {
   }
 
   @Test
-  public void testGetSettersForNavigationProperties()
-  {
+  public void testGetSettersForNavigationProperties() {
     JPACreateRequest createRequest = new JPACreateRequest();
     Method method = getMethodForTesting("getSettersForNavigationProperties", createRequest);
-    if (method != null)
-    {
+    if (method != null) {
       method.setAccessible(true);
       Map<String, Class<?>> relatedClassMap = new HashMap<String, Class<?>>();
       relatedClassMap.put("salesOrderLineItems", SalesOrderLineItem.class);
@@ -154,27 +139,22 @@ public class JPACreateRequestTest {
         List<HashMap<?, ?>> result = (List<HashMap<?, ?>>) method.invoke(createRequest, actualParams);
         assertEquals(2, result.size());
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
 
     }
   }
 
   @Test
-  public void testSetNavigationProperties()
-  {
+  public void testSetNavigationProperties() {
     JPACreateRequest createRequest = new JPACreateRequest();
     Method method = getMethodForTesting("setNavigationProperties", createRequest);
 
-    if (method != null)
-    {
+    if (method != null) {
       method.setAccessible(true);
       Map<String, Class<?>> relatedClassMap = new HashMap<String, Class<?>>();
       relatedClassMap.put("salesOrderLineItems", SalesOrderLineItem.class);
@@ -190,21 +170,17 @@ public class JPACreateRequestTest {
         // If no exception is thrown then we assert true
         assertTrue(true);
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
   }
 
   @Test
-  public void testPopulateEmbeddableKey()
-  {
+  public void testPopulateEmbeddableKey() {
     JPACreateRequest createRequest = new JPACreateRequest();
     Method method = getMethodForTesting("populateEmbeddableKey", createRequest);
     if (method != null) {
@@ -231,24 +207,19 @@ public class JPACreateRequestTest {
         field.set(createRequest, jpaEmbeddableObjectKeyMap);
         method.invoke(createRequest, actualParams);
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (SecurityException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
   }
 
   @Test
-  public void testPopulateEmbeddableKeyInvocationIssue()
-  {
+  public void testPopulateEmbeddableKeyInvocationIssue() {
     JPACreateRequest createRequest = new JPACreateRequest();
     Method method = getMethodForTesting("populateEmbeddableKey", createRequest);
     if (method != null) {
@@ -276,23 +247,19 @@ public class JPACreateRequestTest {
         field.set(createRequest, jpaEmbeddableObjectKeyMap);
         method.invoke(createRequest, actualParams);
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
         assertTrue(true);
       } catch (SecurityException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
   }
 
   @Test
-  public void testPopulateEmbeddableKeyNoSuchMethod()
-  {
+  public void testPopulateEmbeddableKeyNoSuchMethod() {
     JPACreateRequest createRequest = new JPACreateRequest();
     Method method = getMethodForTesting("populateEmbeddableKey", createRequest);
     if (method != null) {
@@ -319,16 +286,13 @@ public class JPACreateRequestTest {
         field.set(createRequest, jpaEmbeddableObjectKeyMap);
         method.invoke(createRequest, actualParams);
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (InvocationTargetException e) {
         assertTrue(true);
       } catch (SecurityException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
   }
@@ -359,12 +323,10 @@ public class JPACreateRequestTest {
     return odataEntry;
   }
 
-  private Method getMethodForTesting(final String methodName, final Object object)
-  {
+  private Method getMethodForTesting(final String methodName, final Object object) {
     Method method = null;
     for (Method m : object.getClass().getDeclaredMethods()) {
-      if (m.getName().equals(methodName))
-      {
+      if (m.getName().equals(methodName)) {
         method = m;
         break;
       }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPATestUtil.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPATestUtil.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPATestUtil.java
index 586363b..bee5b79 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPATestUtil.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPATestUtil.java
@@ -39,8 +39,6 @@ import javax.persistence.metamodel.SetAttribute;
 import javax.persistence.metamodel.SingularAttribute;
 import javax.persistence.metamodel.Type;
 
-import org.easymock.EasyMock;
-
 import org.apache.olingo.odata2.api.edm.EdmEntitySet;
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmException;
@@ -56,11 +54,11 @@ import org.apache.olingo.odata2.api.uri.info.PostUriInfo;
 import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.model.JPAEdmMappingImpl;
+import org.easymock.EasyMock;
 
 public class JPATestUtil {
 
-  public static EdmStructuralType getEdmStructuralType()
-  {
+  public static EdmStructuralType getEdmStructuralType() {
     EdmStructuralType edmType = EasyMock.createMock(EdmStructuralType.class);
     try {
       List<String> propertyNames = new ArrayList<String>();
@@ -75,15 +73,13 @@ public class JPATestUtil {
       EasyMock.expect(edmType.getProperty("description")).andStubReturn(edmProperty2);
       EasyMock.expect(edmType.getMapping()).andStubReturn(edmMapping);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmType);
     return edmType;
   }
 
-  public static Map<String, Object> getPropertyValueMap()
-  {
+  public static Map<String, Object> getPropertyValueMap() {
     Map<String, Object> propertyValueMap = new HashMap<String, Object>();
     propertyValueMap.put("id", 1);
     return propertyValueMap;
@@ -112,15 +108,13 @@ public class JPATestUtil {
       EasyMock.expect(entitySet.getEntityType()).andStubReturn(mockEdmEntityType(navigationProperty));
       EasyMock.expect(entitySet.getRelatedEntitySet(navigationProperty)).andStubReturn(getSIEntitySet());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entitySet);
     return entitySet;
   }
 
-  public static Object getJPAEntity()
-  {
+  public static Object getJPAEntity() {
     SalesOrderHeader sHead = new SalesOrderHeader(1, "laptop");
     SalesOrderLineItem sItem = new SalesOrderLineItem(23);
     List<SalesOrderLineItem> sItems = new ArrayList<SalesOrderLineItem>();
@@ -155,8 +149,7 @@ public class JPATestUtil {
       EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entityType);
     return entityType;
@@ -165,11 +158,9 @@ public class JPATestUtil {
   private static EdmEntitySet getSIEntitySet() {
     EdmEntitySet entitySet = EasyMock.createMock(EdmEntitySet.class);
     try {
-      EasyMock.expect(entitySet.getEntityType()).andStubReturn(
-          mockTargetEdmEntityType());
+      EasyMock.expect(entitySet.getEntityType()).andStubReturn(mockTargetEdmEntityType());
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entitySet);
     return entitySet;
@@ -183,21 +174,16 @@ public class JPATestUtil {
     List<String> propertyNames = new ArrayList<String>();
     propertyNames.add("price");
     try {
-      EasyMock.expect(mapping.getInternalName()).andStubReturn(
-          "SalesOrderLineItem");
+      EasyMock.expect(mapping.getInternalName()).andStubReturn("SalesOrderLineItem");
       EasyMock.replay(mapping);
-      EasyMock.expect(entityType.getName()).andStubReturn(
-          "SalesOrderLineItem");
+      EasyMock.expect(entityType.getName()).andStubReturn("SalesOrderLineItem");
       EasyMock.expect(entityType.getMapping()).andStubReturn(mapping);
       EdmProperty property = mockEdmPropertyOfTarget();
-      EasyMock.expect(entityType.getProperty("price")).andStubReturn(
-          property);
-      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(
-          propertyNames);
+      EasyMock.expect(entityType.getProperty("price")).andStubReturn(property);
+      EasyMock.expect(entityType.getPropertyNames()).andStubReturn(propertyNames);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(entityType);
     return entityType;
@@ -217,8 +203,7 @@ public class JPATestUtil {
       EasyMock.expect(edmProperty.getType()).andStubReturn(type);
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(mapping);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmProperty);
     return edmProperty;
@@ -234,8 +219,7 @@ public class JPATestUtil {
       EasyMock.expect(navigationProperty.getMapping()).andStubReturn(mapping);
 
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(navigationProperty);
     return navigationProperty;
@@ -243,8 +227,7 @@ public class JPATestUtil {
     //EdmNavigationPropertyImplProv navigationPropertyImplProv = new EdmNavigationPropertyImplProv(edm, property)
   }
 
-  public static Metamodel mockMetaModel()
-  {
+  public static Metamodel mockMetaModel() {
     Set<EntityType<?>> jpaEntities = new HashSet<EntityType<?>>();
     jpaEntities.add(new JPATestUtil.DemoEntityType());
     Metamodel metaModel = EasyMock.createMock(Metamodel.class);
@@ -269,8 +252,7 @@ public class JPATestUtil {
       EasyMock.expect(edmProperty.getType()).andStubReturn(edmType);
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmProperty);
     return edmProperty;
@@ -286,8 +268,7 @@ public class JPATestUtil {
       EasyMock.expect(edmProperty.getType()).andStubReturn(edmType);
       EasyMock.expect(edmProperty.getMapping()).andStubReturn(edmMapping);
     } catch (EdmException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     EasyMock.replay(edmProperty);
     return edmProperty;
@@ -318,30 +299,25 @@ public class JPATestUtil {
 
   }
 
-  static class DemoEntityType implements EntityType<SalesOrderHeader>
-  {
+  static class DemoEntityType implements EntityType<SalesOrderHeader> {
 
     @Override
-    public <Y> SingularAttribute<? super org.apache.olingo.odata2.processor.core.jpa.cud.SalesOrderHeader, Y> getId(
-        final Class<Y> type) {
+    public <Y> SingularAttribute<? super org.apache.olingo.odata2.processor.core.jpa.cud.SalesOrderHeader, Y> getId(final Class<Y> type) {
       return null;
     }
 
     @Override
-    public <Y> SingularAttribute<org.apache.olingo.odata2.processor.core.jpa.cud.SalesOrderHeader, Y> getDeclaredId(
-        final Class<Y> type) {
+    public <Y> SingularAttribute<org.apache.olingo.odata2.processor.core.jpa.cud.SalesOrderHeader, Y> getDeclaredId(final Class<Y> type) {
       return null;
     }
 
     @Override
-    public <Y> SingularAttribute<? super SalesOrderHeader, Y> getVersion(
-        final Class<Y> type) {
+    public <Y> SingularAttribute<? super SalesOrderHeader, Y> getVersion(final Class<Y> type) {
       return null;
     }
 
     @Override
-    public <Y> SingularAttribute<SalesOrderHeader, Y> getDeclaredVersion(
-        final Class<Y> type) {
+    public <Y> SingularAttribute<SalesOrderHeader, Y> getDeclaredVersion(final Class<Y> type) {
       return null;
     }
 
@@ -381,14 +357,12 @@ public class JPATestUtil {
     }
 
     @Override
-    public <Y> SingularAttribute<? super SalesOrderHeader, Y> getSingularAttribute(
-        final String name, final Class<Y> type) {
+    public <Y> SingularAttribute<? super SalesOrderHeader, Y> getSingularAttribute(final String name, final Class<Y> type) {
       return null;
     }
 
     @Override
-    public <Y> SingularAttribute<SalesOrderHeader, Y> getDeclaredSingularAttribute(
-        final String name, final Class<Y> type) {
+    public <Y> SingularAttribute<SalesOrderHeader, Y> getDeclaredSingularAttribute(final String name, final Class<Y> type) {
       return null;
     }
 
@@ -403,50 +377,42 @@ public class JPATestUtil {
     }
 
     @Override
-    public <E> CollectionAttribute<? super SalesOrderHeader, E> getCollection(
-        final String name, final Class<E> elementType) {
+    public <E> CollectionAttribute<? super SalesOrderHeader, E> getCollection(final String name, final Class<E> elementType) {
       return null;
     }
 
     @Override
-    public <E> CollectionAttribute<SalesOrderHeader, E> getDeclaredCollection(
-        final String name, final Class<E> elementType) {
+    public <E> CollectionAttribute<SalesOrderHeader, E> getDeclaredCollection(final String name, final Class<E> elementType) {
       return null;
     }
 
     @Override
-    public <E> SetAttribute<? super SalesOrderHeader, E> getSet(
-        final String name, final Class<E> elementType) {
+    public <E> SetAttribute<? super SalesOrderHeader, E> getSet(final String name, final Class<E> elementType) {
       return null;
     }
 
     @Override
-    public <E> SetAttribute<SalesOrderHeader, E> getDeclaredSet(
-        final String name, final Class<E> elementType) {
+    public <E> SetAttribute<SalesOrderHeader, E> getDeclaredSet(final String name, final Class<E> elementType) {
       return null;
     }
 
     @Override
-    public <E> ListAttribute<? super SalesOrderHeader, E> getList(
-        final String name, final Class<E> elementType) {
+    public <E> ListAttribute<? super SalesOrderHeader, E> getList(final String name, final Class<E> elementType) {
       return null;
     }
 
     @Override
-    public <E> ListAttribute<SalesOrderHeader, E> getDeclaredList(
-        final String name, final Class<E> elementType) {
+    public <E> ListAttribute<SalesOrderHeader, E> getDeclaredList(final String name, final Class<E> elementType) {
       return null;
     }
 
     @Override
-    public <K, V> MapAttribute<? super SalesOrderHeader, K, V> getMap(
-        final String name, final Class<K> keyType, final Class<V> valueType) {
+    public <K, V> MapAttribute<? super SalesOrderHeader, K, V> getMap(final String name, final Class<K> keyType, final Class<V> valueType) {
       return null;
     }
 
     @Override
-    public <K, V> MapAttribute<SalesOrderHeader, K, V> getDeclaredMap(
-        final String name, final Class<K> keyType, final Class<V> valueType) {
+    public <K, V> MapAttribute<SalesOrderHeader, K, V> getDeclaredMap(final String name, final Class<K> keyType, final Class<V> valueType) {
       return null;
     }
 
@@ -471,26 +437,22 @@ public class JPATestUtil {
     }
 
     @Override
-    public SingularAttribute<? super SalesOrderHeader, ?> getSingularAttribute(
-        final String name) {
+    public SingularAttribute<? super SalesOrderHeader, ?> getSingularAttribute(final String name) {
       return null;
     }
 
     @Override
-    public SingularAttribute<SalesOrderHeader, ?> getDeclaredSingularAttribute(
-        final String name) {
+    public SingularAttribute<SalesOrderHeader, ?> getDeclaredSingularAttribute(final String name) {
       return null;
     }
 
     @Override
-    public CollectionAttribute<? super SalesOrderHeader, ?> getCollection(
-        final String name) {
+    public CollectionAttribute<? super SalesOrderHeader, ?> getCollection(final String name) {
       return null;
     }
 
     @Override
-    public CollectionAttribute<SalesOrderHeader, ?> getDeclaredCollection(
-        final String name) {
+    public CollectionAttribute<SalesOrderHeader, ?> getDeclaredCollection(final String name) {
       return null;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequestTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequestTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequestTest.java
index 0238664..e7cd778 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequestTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/JPAUpdateRequestTest.java
@@ -25,13 +25,12 @@ import static org.junit.Assert.fail;
 
 import java.util.Map;
 
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
 import org.apache.olingo.odata2.api.uri.info.PutMergePatchUriInfo;
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
+import org.junit.Test;
 
 public class JPAUpdateRequestTest {
 
@@ -46,8 +45,7 @@ public class JPAUpdateRequestTest {
       if (e.isCausedByMessageException()) {
         assertTrue(true);
       } else {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
     }
 
@@ -66,8 +64,7 @@ public class JPAUpdateRequestTest {
       assertEquals("desktop", ((SalesOrderHeader) result).getDescription());
       assertEquals(1, ((SalesOrderHeader) result).getId());
     } catch (ODataJPARuntimeException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNotNull(result);
     assertEquals(((SalesOrderHeader) result).getId(), 1);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/SalesOrderHeader.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/SalesOrderHeader.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/SalesOrderHeader.java
index 858db9e..55b408c 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/SalesOrderHeader.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/cud/SalesOrderHeader.java
@@ -26,8 +26,7 @@ public class SalesOrderHeader {
   private int id;
   private String description;
 
-  public SalesOrderHeader()
-  {}
+  public SalesOrderHeader() {}
 
   public SalesOrderHeader(final int id, final String description) {
     super();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
index 7bfe54e..71363f4 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/edm/ODataJPAEdmProviderNegativeTest.java
@@ -26,9 +26,6 @@ import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.junit.BeforeClass;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
 import org.apache.olingo.odata2.api.edm.provider.EntityContainer;
@@ -38,6 +35,8 @@ import org.apache.olingo.odata2.api.exception.ODataException;
 import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.ODataJPAContextMock;
 import org.apache.olingo.odata2.processor.core.jpa.model.JPAEdmModel;
+import org.junit.BeforeClass;
+import org.junit.Test;
 
 public class ODataJPAEdmProviderNegativeTest {
 
@@ -61,17 +60,13 @@ public class ODataJPAEdmProviderNegativeTest {
       field.setAccessible(true);
       field.set(edmProvider, new JPAEdmModel(null, null));
     } catch (IllegalArgumentException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (IllegalAccessException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (NoSuchFieldException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     } catch (SecurityException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -80,36 +75,30 @@ public class ODataJPAEdmProviderNegativeTest {
   public void testNullGetEntityContainerInfo() {
     EntityContainerInfo entityContainer = null;
     try {
-      entityContainer = edmProvider
-          .getEntityContainerInfo("salesorderprocessingContainer");
+      entityContainer = edmProvider.getEntityContainerInfo("salesorderprocessingContainer");
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNull(entityContainer);
   }
 
   @Test
   public void testNullGetEntityType() {
-    FullQualifiedName entityTypeName = new FullQualifiedName(
-        "salesorderprocessing", "SalesOrderHeader");
+    FullQualifiedName entityTypeName = new FullQualifiedName("salesorderprocessing", "SalesOrderHeader");
     try {
       assertNull(edmProvider.getEntityType(entityTypeName));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
   @Test
   public void testNullGetComplexType() {
-    FullQualifiedName complexTypeName = new FullQualifiedName(
-        "salesorderprocessing", "Address");
+    FullQualifiedName complexTypeName = new FullQualifiedName("salesorderprocessing", "Address");
     try {
       assertNull(edmProvider.getComplexType(complexTypeName));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
@@ -117,11 +106,9 @@ public class ODataJPAEdmProviderNegativeTest {
   public void testGetAssociationFullQualifiedName() {
     Association association = null;
     try {
-      association = edmProvider.getAssociation(new FullQualifiedName(
-          "salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
+      association = edmProvider.getAssociation(new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
     assertNull(association);
   }
@@ -129,25 +116,18 @@ public class ODataJPAEdmProviderNegativeTest {
   @Test
   public void testGetEntitySet() {
     try {
-      assertNull(edmProvider.getEntitySet(
-          "salesorderprocessingContainer", "SalesOrderHeaders"));
+      assertNull(edmProvider.getEntitySet("salesorderprocessingContainer", "SalesOrderHeaders"));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 
   @Test
   public void testGetAssociationSet() {
     try {
-      assertNull(edmProvider.getAssociationSet(
-          "salesorderprocessingContainer", new FullQualifiedName(
-              "salesorderprocessing",
-              "SalesOrderHeader_SalesOrderItem"),
-          "SalesOrderHeaders", "SalesOrderHeader"));
+      assertNull(edmProvider.getAssociationSet("salesorderprocessingContainer", new FullQualifiedName("salesorderprocessing", "SalesOrderHeader_SalesOrderItem"), "SalesOrderHeaders", "SalesOrderHeader"));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -156,16 +136,13 @@ public class ODataJPAEdmProviderNegativeTest {
   public void testNullGetFunctionImport() {
 
     try {
-      assertNull(edmProvider.getFunctionImport(
-          "salesorderprocessingContainer",
-          "SalesOrder_FunctionImport1"));
+      assertNull(edmProvider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1"));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
-  
+
   @Test
   public void testNullGetFunctionImport2() {
 
@@ -184,25 +161,18 @@ public class ODataJPAEdmProviderNegativeTest {
         schemas.add(schema); //Empty Schema
         field.set(provider, schemas);
       } catch (IllegalArgumentException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (IllegalAccessException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (NoSuchFieldException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       } catch (SecurityException e) {
-        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-            + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+        fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
       }
 
-      assertNull(provider.getFunctionImport(
-          "salesorderprocessingContainer",
-          "SalesOrder_FunctionImport1"));
+      assertNull(provider.getFunctionImport("salesorderprocessingContainer", "SalesOrder_FunctionImport1"));
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
 
   }
@@ -212,8 +182,7 @@ public class ODataJPAEdmProviderNegativeTest {
     try {
       assertNotNull(edmProvider.getSchemas());
     } catch (ODataException e) {
-      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage()
-          + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
+      fail(ODataJPATestConstants.EXCEPTION_MSG_PART_1 + e.getMessage() + ODataJPATestConstants.EXCEPTION_MSG_PART_2);
     }
   }
 


[21/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
index 78e2e7d..69abe74 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAResponseBuilder.java
@@ -66,9 +66,7 @@ import org.apache.olingo.odata2.processor.core.jpa.access.data.JPAExpandCallBack
 public final class ODataJPAResponseBuilder {
 
   /* Response for Read Entity Set */
-  public static <T> ODataResponse build(final List<T> jpaEntities,
-      final GetEntitySetUriInfo resultsView, final String contentType,
-      final ODataJPAContext odataJPAContext) throws ODataJPARuntimeException {
+  public static <T> ODataResponse build(final List<T> jpaEntities, final GetEntitySetUriInfo resultsView, final String contentType, final ODataJPAContext odataJPAContext) throws ODataJPARuntimeException {
 
     EdmEntityType edmEntityType = null;
     ODataResponse odataResponse = null;
@@ -82,17 +80,12 @@ public final class ODataJPAResponseBuilder {
       final List<SelectItem> selectedItems = resultsView.getSelect();
       if (selectedItems != null && selectedItems.size() > 0) {
         for (Object jpaEntity : jpaEntities) {
-          edmPropertyValueMap = jpaResultParser
-              .parse2EdmPropertyValueMap(
-                  jpaEntity,
-                  buildSelectItemList(selectedItems,
-                      edmEntityType));
+          edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, edmEntityType));
           edmEntityList.add(edmPropertyValueMap);
         }
       } else {
         for (Object jpaEntity : jpaEntities) {
-          edmPropertyValueMap = jpaResultParser
-              .parse2EdmPropertyValueMap(jpaEntity, edmEntityType);
+          edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, edmEntityType);
           edmEntityList.add(edmPropertyValueMap);
         }
       }
@@ -101,8 +94,7 @@ public final class ODataJPAResponseBuilder {
         int count = 0;
         for (Object jpaEntity : jpaEntities) {
           Map<String, Object> relationShipMap = edmEntityList.get(count);
-          HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(
-              jpaEntity, constructListofNavProperty(expandList));
+          HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(jpaEntity, constructListofNavProperty(expandList));
           relationShipMap.putAll(navigationMap);
           count++;
         }
@@ -110,32 +102,21 @@ public final class ODataJPAResponseBuilder {
 
       EntityProviderWriteProperties feedProperties = null;
 
-      feedProperties = getEntityProviderProperties(odataJPAContext,
-          resultsView, edmEntityList);
-      odataResponse = EntityProvider.writeFeed(contentType,
-          resultsView.getTargetEntitySet(), edmEntityList,
-          feedProperties);
-      odataResponse = ODataResponse.fromResponse(odataResponse)
-          .status(HttpStatusCodes.OK).build();
+      feedProperties = getEntityProviderProperties(odataJPAContext, resultsView, edmEntityList);
+      odataResponse = EntityProvider.writeFeed(contentType, resultsView.getTargetEntitySet(), edmEntityList, feedProperties);
+      odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.OK).build();
 
     } catch (EntityProviderException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     return odataResponse;
   }
 
   /* Response for Read Entity */
-  public static ODataResponse build(final Object jpaEntity,
-      final GetEntityUriInfo resultsView, final String contentType,
-      final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException,
-      ODataNotFoundException {
+  public static ODataResponse build(final Object jpaEntity, final GetEntityUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException, ODataNotFoundException {
 
     List<ArrayList<NavigationPropertySegment>> expandList = null;
     if (jpaEntity == null) {
@@ -152,69 +133,47 @@ public final class ODataJPAResponseBuilder {
       JPAEntityParser jpaResultParser = JPAEntityParser.create();
       final List<SelectItem> selectedItems = resultsView.getSelect();
       if (selectedItems != null && selectedItems.size() > 0) {
-        edmPropertyValueMap = jpaResultParser
-            .parse2EdmPropertyValueMap(
-                jpaEntity,
-                buildSelectItemList(selectedItems, resultsView
-                    .getTargetEntitySet().getEntityType()));
+        edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, buildSelectItemList(selectedItems, resultsView.getTargetEntitySet().getEntityType()));
       } else {
-        edmPropertyValueMap = jpaResultParser
-            .parse2EdmPropertyValueMap(jpaEntity, edmEntityType);
+        edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, edmEntityType);
       }
 
       expandList = resultsView.getExpand();
-      if (expandList != null && expandList.size() != 0)
-      {
-        HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(
-            jpaEntity, constructListofNavProperty(expandList));
+      if (expandList != null && expandList.size() != 0) {
+        HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(jpaEntity, constructListofNavProperty(expandList));
         edmPropertyValueMap.putAll(navigationMap);
       }
       EntityProviderWriteProperties feedProperties = null;
-      feedProperties = getEntityProviderProperties(oDataJPAContext,
-          resultsView);
-      odataResponse = EntityProvider.writeEntry(contentType,
-          resultsView.getTargetEntitySet(), edmPropertyValueMap,
-          feedProperties);
+      feedProperties = getEntityProviderProperties(oDataJPAContext, resultsView);
+      odataResponse = EntityProvider.writeEntry(contentType, resultsView.getTargetEntitySet(), edmPropertyValueMap, feedProperties);
 
-      odataResponse = ODataResponse.fromResponse(odataResponse)
-          .status(HttpStatusCodes.OK).build();
+      odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.OK).build();
 
     } catch (EntityProviderException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     return odataResponse;
   }
 
   /* Response for $count */
-  public static ODataResponse build(final long jpaEntityCount,
-      final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException {
+  public static ODataResponse build(final long jpaEntityCount, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException {
 
     ODataResponse odataResponse = null;
     try {
-      odataResponse = EntityProvider.writeText(String
-          .valueOf(jpaEntityCount));
+      odataResponse = EntityProvider.writeText(String.valueOf(jpaEntityCount));
       odataResponse = ODataResponse.fromResponse(odataResponse).build();
     } catch (EntityProviderException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
     return odataResponse;
   }
 
   /* Response for Create Entity */
   @SuppressWarnings("unchecked")
-  public static ODataResponse build(final List<Object> createdObjectList,
-      final PostUriInfo uriInfo, final String contentType,
-      final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException,
-      ODataNotFoundException {
+  public static ODataResponse build(final List<Object> createdObjectList, final PostUriInfo uriInfo, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException, ODataNotFoundException {
 
     if (createdObjectList == null || createdObjectList.size() == 0 || createdObjectList.get(0) == null) {
       throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
@@ -229,48 +188,36 @@ public final class ODataJPAResponseBuilder {
       Map<String, Object> edmPropertyValueMap = null;
 
       JPAEntityParser jpaResultParser = JPAEntityParser.create();
-      edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(
-          createdObjectList.get(0), edmEntityType);
+      edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(createdObjectList.get(0), edmEntityType);
 
       List<ArrayList<NavigationPropertySegment>> expandList = null;
       if (createdObjectList.get(1) != null && ((Map<EdmNavigationProperty, EdmEntitySet>) createdObjectList.get(1)).size() > 0) {
         expandList = getExpandList((Map<EdmNavigationProperty, EdmEntitySet>) createdObjectList.get(1));
-        HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(
-            createdObjectList.get(0), constructListofNavProperty(expandList));
+        HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(createdObjectList.get(0), constructListofNavProperty(expandList));
         edmPropertyValueMap.putAll(navigationMap);
       }
       EntityProviderWriteProperties feedProperties = null;
       try {
         feedProperties = getEntityProviderPropertiesforPost(oDataJPAContext, uriInfo, expandList);
       } catch (ODataException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.INNER_EXCEPTION, e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
       }
 
-      odataResponse = EntityProvider.writeEntry(contentType,
-          uriInfo.getTargetEntitySet(), edmPropertyValueMap,
-          feedProperties);
+      odataResponse = EntityProvider.writeEntry(contentType, uriInfo.getTargetEntitySet(), edmPropertyValueMap, feedProperties);
 
-      odataResponse = ODataResponse.fromResponse(odataResponse)
-          .status(HttpStatusCodes.CREATED).build();
+      odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.CREATED).build();
 
     } catch (EntityProviderException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     return odataResponse;
   }
 
   /* Response for Update Entity */
-  public static ODataResponse build(final Object updatedObject,
-      final PutMergePatchUriInfo putUriInfo) throws ODataJPARuntimeException,
-      ODataNotFoundException {
+  public static ODataResponse build(final Object updatedObject, final PutMergePatchUriInfo putUriInfo) throws ODataJPARuntimeException, ODataNotFoundException {
     if (updatedObject == null) {
       throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
     }
@@ -278,9 +225,7 @@ public final class ODataJPAResponseBuilder {
   }
 
   /* Response for Delete Entity */
-  public static ODataResponse build(final Object deletedObject,
-      final DeleteUriInfo deleteUriInfo) throws ODataJPARuntimeException,
-      ODataNotFoundException {
+  public static ODataResponse build(final Object deletedObject, final DeleteUriInfo deleteUriInfo) throws ODataJPARuntimeException, ODataNotFoundException {
 
     if (deletedObject == null) {
       throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
@@ -289,21 +234,16 @@ public final class ODataJPAResponseBuilder {
   }
 
   /* Response for Function Import Single Result */
-  public static ODataResponse build(final Object result,
-      final GetFunctionImportUriInfo resultsView)
-      throws ODataJPARuntimeException {
+  public static ODataResponse build(final Object result, final GetFunctionImportUriInfo resultsView) throws ODataJPARuntimeException {
 
     try {
-      final EdmFunctionImport functionImport = resultsView
-          .getFunctionImport();
-      final EdmSimpleType type = (EdmSimpleType) functionImport
-          .getReturnType().getType();
+      final EdmFunctionImport functionImport = resultsView.getFunctionImport();
+      final EdmSimpleType type = (EdmSimpleType) functionImport.getReturnType().getType();
 
       if (result != null) {
         ODataResponse response = null;
 
-        final String value = type.valueToString(result,
-            EdmLiteralKind.DEFAULT, null);
+        final String value = type.valueToString(result, EdmLiteralKind.DEFAULT, null);
         response = EntityProvider.writeText(value);
 
         return ODataResponse.fromResponse(response).build();
@@ -311,24 +251,16 @@ public final class ODataJPAResponseBuilder {
         throw new ODataNotFoundException(ODataHttpException.COMMON);
       }
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EntityProviderException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (ODataException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.INNER_EXCEPTION, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
     }
   }
 
   /* Response for Function Import Multiple Result */
-  public static ODataResponse build(final List<Object> resultList,
-      final GetFunctionImportUriInfo resultsView, final String contentType,
-      final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException,
-      ODataNotFoundException {
+  public static ODataResponse build(final List<Object> resultList, final GetFunctionImportUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException, ODataNotFoundException {
 
     ODataResponse odataResponse = null;
 
@@ -342,31 +274,23 @@ public final class ODataJPAResponseBuilder {
       try {
         EntityProviderWriteProperties feedProperties = null;
 
-        feedProperties = EntityProviderWriteProperties.serviceRoot(
-            oDataJPAContext.getODataContext().getPathInfo()
-                .getServiceRoot()).build();
+        feedProperties = EntityProviderWriteProperties.serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot()).build();
 
         functionImport = resultsView.getFunctionImport();
         edmType = functionImport.getReturnType().getType();
 
-        if (edmType.getKind().equals(EdmTypeKind.ENTITY)
-            || edmType.getKind().equals(EdmTypeKind.COMPLEX)) {
-          if (functionImport.getReturnType().getMultiplicity()
-              .equals(EdmMultiplicity.MANY)) {
+        if (edmType.getKind().equals(EdmTypeKind.ENTITY) || edmType.getKind().equals(EdmTypeKind.COMPLEX)) {
+          if (functionImport.getReturnType().getMultiplicity().equals(EdmMultiplicity.MANY)) {
             edmEntityList = new ArrayList<Map<String, Object>>();
             for (Object jpaEntity : resultList) {
-              edmPropertyValueMap = jpaResultParser
-                  .parse2EdmPropertyValueMap(jpaEntity,
-                      (EdmStructuralType) edmType);
+              edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, (EdmStructuralType) edmType);
               edmEntityList.add(edmPropertyValueMap);
             }
             result = edmEntityList;
           } else {
 
             Object resultObject = resultList.get(0);
-            edmPropertyValueMap = jpaResultParser
-                .parse2EdmPropertyValueMap(resultObject,
-                    (EdmStructuralType) edmType);
+            edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(resultObject, (EdmStructuralType) edmType);
 
             result = edmPropertyValueMap;
           }
@@ -375,24 +299,15 @@ public final class ODataJPAResponseBuilder {
           result = resultList.get(0);
         }
 
-        odataResponse = EntityProvider
-            .writeFunctionImport(contentType,
-                resultsView.getFunctionImport(), result,
-                feedProperties);
-        odataResponse = ODataResponse.fromResponse(odataResponse)
-            .status(HttpStatusCodes.OK).build();
+        odataResponse = EntityProvider.writeFunctionImport(contentType, resultsView.getFunctionImport(), result, feedProperties);
+        odataResponse = ODataResponse.fromResponse(odataResponse).status(HttpStatusCodes.OK).build();
 
       } catch (EdmException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (EntityProviderException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (ODataException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.INNER_EXCEPTION, e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
       }
 
     } else {
@@ -403,9 +318,7 @@ public final class ODataJPAResponseBuilder {
   }
 
   /* Response for Read Entity Link */
-  public static ODataResponse build(final Object jpaEntity,
-      final GetEntityLinkUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext)
-      throws ODataNotFoundException, ODataJPARuntimeException {
+  public static ODataResponse build(final Object jpaEntity, final GetEntityLinkUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataNotFoundException, ODataJPARuntimeException {
 
     if (jpaEntity == null) {
       throw new ODataNotFoundException(ODataNotFoundException.ENTITY);
@@ -420,22 +333,16 @@ public final class ODataJPAResponseBuilder {
       Map<String, Object> edmPropertyValueMap = null;
 
       JPAEntityParser jpaResultParser = JPAEntityParser.create();
-      edmPropertyValueMap = jpaResultParser
-          .parse2EdmPropertyValueMap(
-              jpaEntity,
-              edmEntityType.getKeyProperties());
+      edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, edmEntityType.getKeyProperties());
 
-      EntityProviderWriteProperties entryProperties = EntityProviderWriteProperties
-          .serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot())
-          .build();
+      EntityProviderWriteProperties entryProperties = EntityProviderWriteProperties.serviceRoot(oDataJPAContext.getODataContext().getPathInfo().getServiceRoot()).build();
 
       ODataResponse response = EntityProvider.writeLink(contentType, entitySet, edmPropertyValueMap, entryProperties);
 
       odataResponse = ODataResponse.fromResponse(response).build();
 
     } catch (ODataException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.INNER_EXCEPTION, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
 
     }
 
@@ -443,10 +350,7 @@ public final class ODataJPAResponseBuilder {
   }
 
   /* Response for Read Entity Links */
-  public static <T> ODataResponse build(final List<T> jpaEntities,
-      final GetEntitySetLinksUriInfo resultsView, final String contentType,
-      final ODataJPAContext oDataJPAContext)
-      throws ODataJPARuntimeException {
+  public static <T> ODataResponse build(final List<T> jpaEntities, final GetEntitySetLinksUriInfo resultsView, final String contentType, final ODataJPAContext oDataJPAContext) throws ODataJPARuntimeException {
     EdmEntityType edmEntityType = null;
     ODataResponse odataResponse = null;
 
@@ -461,10 +365,7 @@ public final class ODataJPAResponseBuilder {
       JPAEntityParser jpaResultParser = JPAEntityParser.create();
 
       for (Object jpaEntity : jpaEntities) {
-        edmPropertyValueMap = jpaResultParser
-            .parse2EdmPropertyValueMap(
-                jpaEntity,
-                keyProperties);
+        edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(jpaEntity, keyProperties);
         edmEntityList.add(edmPropertyValueMap);
       }
 
@@ -475,26 +376,19 @@ public final class ODataJPAResponseBuilder {
           count = getInlineCountForNonFilterQueryLinks(edmEntityList, resultsView);
         } else {
           // In all other cases
-          count = resultsView.getInlineCount() == InlineCount.ALLPAGES ? edmEntityList
-              .size() : null;
+          count = resultsView.getInlineCount() == InlineCount.ALLPAGES ? edmEntityList.size() : null;
         }
       }
 
       ODataContext context = oDataJPAContext.getODataContext();
-      EntityProviderWriteProperties entryProperties = EntityProviderWriteProperties
-          .serviceRoot(context.getPathInfo().getServiceRoot())
-          .inlineCountType(resultsView.getInlineCount())
-          .inlineCount(count)
-          .build();
+      EntityProviderWriteProperties entryProperties = EntityProviderWriteProperties.serviceRoot(context.getPathInfo().getServiceRoot()).inlineCountType(resultsView.getInlineCount()).inlineCount(count).build();
 
       odataResponse = EntityProvider.writeLinks(contentType, entitySet, edmEntityList, entryProperties);
 
       odataResponse = ODataResponse.fromResponse(odataResponse).build();
 
     } catch (ODataException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     return odataResponse;
@@ -537,10 +431,7 @@ public final class ODataJPAResponseBuilder {
    * Method to build the entity provider Property.Callbacks for $expand would
    * be registered here
    */
-  private static EntityProviderWriteProperties getEntityProviderProperties(
-      final ODataJPAContext odataJPAContext, final GetEntitySetUriInfo resultsView,
-      final List<Map<String, Object>> edmEntityList)
-      throws ODataJPARuntimeException {
+  private static EntityProviderWriteProperties getEntityProviderProperties(final ODataJPAContext odataJPAContext, final GetEntitySetUriInfo resultsView, final List<Map<String, Object>> edmEntityList) throws ODataJPARuntimeException {
     ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
 
     Integer count = null;
@@ -550,30 +441,20 @@ public final class ODataJPAResponseBuilder {
         count = getInlineCountForNonFilterQueryEntitySet(edmEntityList, resultsView);
       } else {
         // In all other cases
-        count = resultsView.getInlineCount() == InlineCount.ALLPAGES ? edmEntityList
-            .size() : null;
+        count = resultsView.getInlineCount() == InlineCount.ALLPAGES ? edmEntityList.size() : null;
       }
     }
 
     try {
-      entityFeedPropertiesBuilder = EntityProviderWriteProperties
-          .serviceRoot(odataJPAContext.getODataContext()
-              .getPathInfo().getServiceRoot());
+      entityFeedPropertiesBuilder = EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
       entityFeedPropertiesBuilder.inlineCount(count);
-      entityFeedPropertiesBuilder.inlineCountType(resultsView
-          .getInlineCount());
-      ExpandSelectTreeNode expandSelectTree = UriParser
-          .createExpandSelectTree(resultsView.getSelect(),
-              resultsView.getExpand());
-      entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack
-          .getCallbacks(odataJPAContext.getODataContext()
-              .getPathInfo().getServiceRoot(), expandSelectTree,
-              resultsView.getExpand()));
+      entityFeedPropertiesBuilder.inlineCountType(resultsView.getInlineCount());
+      ExpandSelectTreeNode expandSelectTree = UriParser.createExpandSelectTree(resultsView.getSelect(), resultsView.getExpand());
+      entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext().getPathInfo().getServiceRoot(), expandSelectTree, resultsView.getExpand()));
       entityFeedPropertiesBuilder.expandSelectTree(expandSelectTree);
 
     } catch (ODataException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.INNER_EXCEPTION, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
     }
 
     return entityFeedPropertiesBuilder.build();
@@ -607,49 +488,31 @@ public final class ODataJPAResponseBuilder {
     return count;
   }
 
-  private static EntityProviderWriteProperties getEntityProviderProperties(
-      final ODataJPAContext odataJPAContext, final GetEntityUriInfo resultsView)
-      throws ODataJPARuntimeException {
+  private static EntityProviderWriteProperties getEntityProviderProperties(final ODataJPAContext odataJPAContext, final GetEntityUriInfo resultsView) throws ODataJPARuntimeException {
     ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
     ExpandSelectTreeNode expandSelectTree = null;
     try {
-      entityFeedPropertiesBuilder = EntityProviderWriteProperties
-          .serviceRoot(odataJPAContext.getODataContext()
-              .getPathInfo().getServiceRoot());
-      expandSelectTree = UriParser.createExpandSelectTree(
-          resultsView.getSelect(), resultsView.getExpand());
+      entityFeedPropertiesBuilder = EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
+      expandSelectTree = UriParser.createExpandSelectTree(resultsView.getSelect(), resultsView.getExpand());
       entityFeedPropertiesBuilder.expandSelectTree(expandSelectTree);
-      entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack
-          .getCallbacks(odataJPAContext.getODataContext()
-              .getPathInfo().getServiceRoot(), expandSelectTree,
-              resultsView.getExpand()));
+      entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext().getPathInfo().getServiceRoot(), expandSelectTree, resultsView.getExpand()));
     } catch (ODataException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.INNER_EXCEPTION, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
     }
 
     return entityFeedPropertiesBuilder.build();
   }
 
-  private static EntityProviderWriteProperties getEntityProviderPropertiesforPost(
-      final ODataJPAContext odataJPAContext, final PostUriInfo resultsView, final List<ArrayList<NavigationPropertySegment>> expandList)
-      throws ODataJPARuntimeException {
+  private static EntityProviderWriteProperties getEntityProviderPropertiesforPost(final ODataJPAContext odataJPAContext, final PostUriInfo resultsView, final List<ArrayList<NavigationPropertySegment>> expandList) throws ODataJPARuntimeException {
     ODataEntityProviderPropertiesBuilder entityFeedPropertiesBuilder = null;
     ExpandSelectTreeNode expandSelectTree = null;
     try {
-      entityFeedPropertiesBuilder = EntityProviderWriteProperties
-          .serviceRoot(odataJPAContext.getODataContext()
-              .getPathInfo().getServiceRoot());
-      expandSelectTree = UriParser.createExpandSelectTree(
-          null, expandList);
+      entityFeedPropertiesBuilder = EntityProviderWriteProperties.serviceRoot(odataJPAContext.getODataContext().getPathInfo().getServiceRoot());
+      expandSelectTree = UriParser.createExpandSelectTree(null, expandList);
       entityFeedPropertiesBuilder.expandSelectTree(expandSelectTree);
-      entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack
-          .getCallbacks(odataJPAContext.getODataContext()
-              .getPathInfo().getServiceRoot(), expandSelectTree,
-              expandList));
+      entityFeedPropertiesBuilder.callbacks(JPAExpandCallBack.getCallbacks(odataJPAContext.getODataContext().getPathInfo().getServiceRoot(), expandSelectTree, expandList));
     } catch (ODataException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.INNER_EXCEPTION, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.INNER_EXCEPTION, e);
     }
 
     return entityFeedPropertiesBuilder.build();
@@ -679,8 +542,7 @@ public final class ODataJPAResponseBuilder {
     return expandList;
   }
 
-  private static List<EdmProperty> buildSelectItemList(
-      final List<SelectItem> selectItems, final EdmEntityType entity) throws ODataJPARuntimeException {
+  private static List<EdmProperty> buildSelectItemList(final List<SelectItem> selectItems, final EdmEntityType entity) throws ODataJPARuntimeException {
     boolean flag = false;
     List<EdmProperty> selectPropertyList = new ArrayList<EdmProperty>();
     try {
@@ -701,19 +563,15 @@ public final class ODataJPAResponseBuilder {
       }
 
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
     return selectPropertyList;
   }
 
-  private static List<EdmNavigationProperty> constructListofNavProperty(
-      final List<ArrayList<NavigationPropertySegment>> expandList) {
+  private static List<EdmNavigationProperty> constructListofNavProperty(final List<ArrayList<NavigationPropertySegment>> expandList) {
     List<EdmNavigationProperty> navigationPropertyList = new ArrayList<EdmNavigationProperty>();
     for (ArrayList<NavigationPropertySegment> navpropSegment : expandList) {
-      navigationPropertyList.add(navpropSegment.get(0)
-          .getNavigationProperty());
+      navigationPropertyList.add(navpropSegment.get(0).getNavigationProperty());
     }
     return navigationPropertyList;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
index 72e81fa..532561e 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAEntityParser.java
@@ -48,8 +48,7 @@ public final class JPAEntityParser {
   private static JPAEntityParser jpaEntityParser;
 
   private JPAEntityParser() {
-    jpaEntityAccessMap = new HashMap<String, HashMap<String, Method>>(
-        MAX_SIZE);
+    jpaEntityAccessMap = new HashMap<String, HashMap<String, Method>>(MAX_SIZE);
     jpaEmbeddableKeyMap = new HashMap<String, HashMap<String, String>>();
   };
 
@@ -71,9 +70,7 @@ public final class JPAEntityParser {
    * @throws ODataJPARuntimeException
    */
 
-  public final HashMap<String, Object> parse2EdmPropertyValueMap(
-      final Object jpaEntity, final List<EdmProperty> selectPropertyList)
-      throws ODataJPARuntimeException {
+  public final HashMap<String, Object> parse2EdmPropertyValueMap(final Object jpaEntity, final List<EdmProperty> selectPropertyList) throws ODataJPARuntimeException {
     HashMap<String, Object> edmEntity = new HashMap<String, Object>();
     String methodName = null;
     Method method = null;
@@ -84,31 +81,25 @@ public final class JPAEntityParser {
       property = selectPropertyList.get(i);
 
       try {
-        methodName = getAccessModifierName(property.getName(),
-            property.getMapping(), ACCESS_MODIFIER_GET);
+        methodName = getAccessModifierName(property.getName(), property.getMapping(), ACCESS_MODIFIER_GET);
         String[] nameParts = methodName.split("\\.");
         if (nameParts.length > 1) {
           Object propertyVal = new Object();
           propertyVal = jpaEntity;
           for (String namePart : nameParts) {
-            method = propertyVal.getClass().getMethod(
-                namePart, (Class<?>[]) null);
+            method = propertyVal.getClass().getMethod(namePart, (Class<?>[]) null);
             method.setAccessible(true);
             propertyVal = method.invoke(propertyVal);
           }
           edmEntity.put(property.getName(), propertyVal);
         } else {
-          method = jpaEntity.getClass().getMethod(methodName,
-              (Class<?>[]) null);
+          method = jpaEntity.getClass().getMethod(methodName, (Class<?>[]) null);
           method.setAccessible(true);
           propertyValue = method.invoke(jpaEntity);
           key = property.getName();
-          if (property.getType().getKind()
-              .equals(EdmTypeKind.COMPLEX)) {
+          if (property.getType().getKind().equals(EdmTypeKind.COMPLEX)) {
             try {
-              propertyValue = parse2EdmPropertyValueMap(
-                  propertyValue,
-                  (EdmStructuralType) property.getType());
+              propertyValue = parse2EdmPropertyValueMap(propertyValue, (EdmStructuralType) property.getType());
             } catch (ODataJPARuntimeException e) {
               throw e;
             }
@@ -116,29 +107,17 @@ public final class JPAEntityParser {
           edmEntity.put(key, propertyValue);
         }
       } catch (EdmException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (SecurityException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (NoSuchMethodException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (IllegalArgumentException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (IllegalAccessException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (InvocationTargetException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
     }
 
@@ -156,9 +135,7 @@ public final class JPAEntityParser {
    * @return a Hash Map of Properties and values for given EdmEntity Type
    * @throws ODataJPARuntimeException
    */
-  public final HashMap<String, Object> parse2EdmPropertyValueMap(
-      final Object jpaEntity, final EdmStructuralType structuralType)
-      throws ODataJPARuntimeException {
+  public final HashMap<String, Object> parse2EdmPropertyValueMap(final Object jpaEntity, final EdmStructuralType structuralType) throws ODataJPARuntimeException {
 
     if (jpaEntity == null || structuralType == null) {
       return null;
@@ -167,21 +144,17 @@ public final class JPAEntityParser {
     String jpaEntityAccessKey = jpaEntity.getClass().getName();
 
     if (!jpaEntityAccessMap.containsKey(jpaEntityAccessKey)) {
-      jpaEntityAccessMap.put(jpaEntityAccessKey,
-          getAccessModifier(jpaEntity, structuralType, ACCESS_MODIFIER_GET));
+      jpaEntityAccessMap.put(jpaEntityAccessKey, getAccessModifier(jpaEntity, structuralType, ACCESS_MODIFIER_GET));
     }
 
     HashMap<String, Object> edmEntity = new HashMap<String, Object>();
-    HashMap<String, Method> getters = jpaEntityAccessMap
-        .get(jpaEntityAccessKey);
-    HashMap<String, String> embeddableKeys = jpaEmbeddableKeyMap
-        .get(jpaEntityAccessKey);
+    HashMap<String, Method> getters = jpaEntityAccessMap.get(jpaEntityAccessKey);
+    HashMap<String, String> embeddableKeys = jpaEmbeddableKeyMap.get(jpaEntityAccessKey);
 
     try {
       for (String key : getters.keySet()) {
 
-        EdmProperty property = (EdmProperty) structuralType
-            .getProperty(key);
+        EdmProperty property = (EdmProperty) structuralType.getProperty(key);
 
         Method method = getters.get(key);
         Object propertyValue = null;
@@ -192,8 +165,7 @@ public final class JPAEntityParser {
         }
 
         if (property.getType().getKind().equals(EdmTypeKind.COMPLEX)) {
-          propertyValue = parse2EdmPropertyValueMap(propertyValue,
-              (EdmStructuralType) property.getType());
+          propertyValue = parse2EdmPropertyValueMap(propertyValue, (EdmStructuralType) property.getType());
         }
 
         edmEntity.put(key, propertyValue);
@@ -207,8 +179,7 @@ public final class JPAEntityParser {
           Object propertyValue = jpaEntity;
           Method method = null;
           for (String namePart : nameParts) {
-            method = propertyValue.getClass().getMethod(
-                namePart, (Class<?>[]) null);
+            method = propertyValue.getClass().getMethod(namePart, (Class<?>[]) null);
             method.setAccessible(true);
             propertyValue = method.invoke(propertyValue);
           }
@@ -216,129 +187,86 @@ public final class JPAEntityParser {
         }
       }
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (SecurityException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (NoSuchMethodException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalAccessException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (InvocationTargetException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
     return edmEntity;
   }
 
   // This method appends the associated entities as a java list to an expanded
   // map of a source entity
-  public final HashMap<String, Object> parse2EdmNavigationValueMap(
-      final Object jpaEntity, final List<EdmNavigationProperty> navigationPropertyList)
-      throws ODataJPARuntimeException {
+  public final HashMap<String, Object> parse2EdmNavigationValueMap(final Object jpaEntity, final List<EdmNavigationProperty> navigationPropertyList) throws ODataJPARuntimeException {
     Object result = null;
     String methodName = null;
     HashMap<String, Object> navigationMap = new HashMap<String, Object>();
-    if (navigationPropertyList != null
-        && navigationPropertyList.size() != 0) {
+    if (navigationPropertyList != null && navigationPropertyList.size() != 0) {
 
       try {
         for (EdmNavigationProperty navigationProperty : navigationPropertyList) {
-          methodName = getAccessModifierName(navigationProperty.getName(),
-              navigationProperty.getMapping(), ACCESS_MODIFIER_GET);
-          Method getterMethod = jpaEntity.getClass()
-              .getDeclaredMethod(methodName, (Class<?>[]) null);
+          methodName = getAccessModifierName(navigationProperty.getName(), navigationProperty.getMapping(), ACCESS_MODIFIER_GET);
+          Method getterMethod = jpaEntity.getClass().getDeclaredMethod(methodName, (Class<?>[]) null);
           getterMethod.setAccessible(true);
           result = getterMethod.invoke(jpaEntity);
           navigationMap.put(navigationProperty.getName(), result);
         }
       } catch (IllegalArgumentException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (IllegalAccessException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (InvocationTargetException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (EdmException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (SecurityException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       } catch (NoSuchMethodException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
     }
     return navigationMap;
   }
 
-  public HashMap<String, Method> getAccessModifier(final Object jpaEntity,
-      final EdmStructuralType structuralType, final String accessModifier) throws ODataJPARuntimeException {
+  public HashMap<String, Method> getAccessModifier(final Object jpaEntity, final EdmStructuralType structuralType, final String accessModifier) throws ODataJPARuntimeException {
 
     HashMap<String, Method> accessModifierMap = new HashMap<String, Method>();
     HashMap<String, String> embeddableKey = new HashMap<String, String>();
     try {
       for (String propertyName : structuralType.getPropertyNames()) {
 
-        EdmProperty property = (EdmProperty) structuralType
-            .getProperty(propertyName);
+        EdmProperty property = (EdmProperty) structuralType.getProperty(propertyName);
 
-        String name = getAccessModifierName(property.getName(),
-            property.getMapping(), accessModifier);
+        String name = getAccessModifierName(property.getName(), property.getMapping(), accessModifier);
         String[] nameParts = name.split("\\.");
         if (nameParts.length > 1) {
           embeddableKey.put(propertyName, name);
         } else {
-          accessModifierMap.put(
-              propertyName,
-              jpaEntity.getClass().getMethod(name,
-                  (Class<?>[]) null));
+          accessModifierMap.put(propertyName, jpaEntity.getClass().getMethod(name, (Class<?>[]) null));
         }
       }
     } catch (NoSuchMethodException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (SecurityException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     if (!embeddableKey.isEmpty()) {
-      jpaEmbeddableKeyMap.put(jpaEntity.getClass().getName(),
-          embeddableKey);
+      jpaEmbeddableKeyMap.put(jpaEntity.getClass().getName(), embeddableKey);
     }
     return accessModifierMap;
   }
 
-  private static String getAccessModifierName(final String propertyName, final EdmMapping mapping, final String accessModifier)
-      throws ODataJPARuntimeException {
+  private static String getAccessModifierName(final String propertyName, final EdmMapping mapping, final String accessModifier) throws ODataJPARuntimeException {
     String name = null;
     StringBuilder builder = new StringBuilder();
     String[] nameParts = {};
@@ -354,8 +282,7 @@ public final class JPAEntityParser {
       if (name != null) {
         char c = Character.toUpperCase(name.charAt(0));
 
-        builder.append(accessModifier).append(c).append(name.substring(1))
-            .toString();
+        builder.append(accessModifier).append(c).append(name.substring(1)).toString();
       }
     } else if (nameParts.length > 1) {
 
@@ -365,8 +292,7 @@ public final class JPAEntityParser {
         if (i == 0) {
           builder.append(accessModifier).append(c).append(name.substring(1));
         } else {
-          builder.append(".").append(accessModifier).append(c)
-              .append(name.substring(1));
+          builder.append(".").append(accessModifier).append(c).append(name.substring(1));
         }
       }
     } else {
@@ -381,13 +307,11 @@ public final class JPAEntityParser {
 
   }
 
-  public Method getAccessModifier(final Object jpaEntity, final EdmNavigationProperty navigationProperty, final String accessModifier)
-      throws ODataJPARuntimeException {
+  public Method getAccessModifier(final Object jpaEntity, final EdmNavigationProperty navigationProperty, final String accessModifier) throws ODataJPARuntimeException {
 
     try {
 
-      String name = getAccessModifierName(navigationProperty.getName(),
-          navigationProperty.getMapping(), accessModifier);
+      String name = getAccessModifierName(navigationProperty.getName(), navigationProperty.getMapping(), accessModifier);
 
       Class<?>[] params = null;
       if (accessModifier.equals(ACCESS_MODIFIER_SET)) {
@@ -402,21 +326,14 @@ public final class JPAEntityParser {
           break;
         }
       }
-      return jpaEntity.getClass().getMethod(name,
-          params);
+      return jpaEntity.getClass().getMethod(name, params);
 
     } catch (NoSuchMethodException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (SecurityException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
index eb875d8..52917e2 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAExpandCallBack.java
@@ -55,8 +55,7 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
   }
 
   @Override
-  public WriteEntryCallbackResult retrieveEntryResult(
-      final WriteEntryCallbackContext context) {
+  public WriteEntryCallbackResult retrieveEntryResult(final WriteEntryCallbackContext context) {
     WriteEntryCallbackResult result = new WriteEntryCallbackResult();
     Map<String, Object> entry = context.getEntryData();
     Map<String, Object> edmPropertyValueMap = null;
@@ -72,8 +71,7 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
       edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(inlinedEntry, nextEntitySet.getEntityType());
       result.setEntryData(edmPropertyValueMap);
       navigationLinks = context.getCurrentExpandSelectTreeNode().getLinks();
-      if (navigationLinks.size() > 0)
-      {
+      if (navigationLinks.size() > 0) {
         currentNavPropertyList = new ArrayList<EdmNavigationProperty>();
         currentNavPropertyList.add(getNextNavigationProperty(context.getSourceEntitySet().getEntityType(), context.getNavigationProperty()));
         HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(inlinedEntry, currentNavPropertyList);
@@ -91,8 +89,7 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
   }
 
   @Override
-  public WriteFeedCallbackResult retrieveFeedResult(
-      final WriteFeedCallbackContext context) {
+  public WriteFeedCallbackResult retrieveFeedResult(final WriteFeedCallbackContext context) {
     WriteFeedCallbackResult result = new WriteFeedCallbackResult();
     HashMap<String, Object> inlinedEntry = (HashMap<String, Object>) context.getEntryData();
     List<Map<String, Object>> edmEntityList = new ArrayList<Map<String, Object>>();
@@ -106,19 +103,16 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
       if (nextEntitySet == null) {
         nextEntitySet = context.getSourceEntitySet().getRelatedEntitySet(currentNavigationProperty);
       }
-      for (Object object : listOfItems)
-      {
+      for (Object object : listOfItems) {
         edmPropertyValueMap = jpaResultParser.parse2EdmPropertyValueMap(object, nextEntitySet.getEntityType());
         edmEntityList.add(edmPropertyValueMap);
       }
       result.setFeedData(edmEntityList);
-      if (context.getCurrentExpandSelectTreeNode().getLinks().size() > 0)
-      {
+      if (context.getCurrentExpandSelectTreeNode().getLinks().size() > 0) {
         currentNavPropertyList = new ArrayList<EdmNavigationProperty>();
         currentNavPropertyList.add(getNextNavigationProperty(context.getSourceEntitySet().getEntityType(), context.getNavigationProperty()));
         int count = 0;
-        for (Object object : listOfItems)
-        {
+        for (Object object : listOfItems) {
           HashMap<String, Object> navigationMap = jpaResultParser.parse2EdmNavigationValueMap(object, currentNavPropertyList);
           edmEntityList.get(count).putAll(navigationMap);
           count++;
@@ -134,14 +128,11 @@ public class JPAExpandCallBack implements OnWriteFeedContent, OnWriteEntryConten
     return result;
   }
 
-  private EdmNavigationProperty getNextNavigationProperty(
-      final EdmEntityType sourceEntityType, final EdmNavigationProperty navigationProperty) throws EdmException {
+  private EdmNavigationProperty getNextNavigationProperty(final EdmEntityType sourceEntityType, final EdmNavigationProperty navigationProperty) throws EdmException {
     int count;
-    for (ArrayList<NavigationPropertySegment> navPropSegments : expandList)
-    {
+    for (ArrayList<NavigationPropertySegment> navPropSegments : expandList) {
       count = 0;
-      for (NavigationPropertySegment navPropSegment : navPropSegments)
-      {
+      for (NavigationPropertySegment navPropSegment : navPropSegments) {
         EdmNavigationProperty navProperty = navPropSegment.getNavigationProperty();
         if (navProperty.getFromRole().equalsIgnoreCase(sourceEntityType.getName()) && navProperty.getName().equals(navigationProperty.getName())) {
           return navPropSegments.get(count + 1).getNavigationProperty();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
index ecebd48..000d018 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAFunctionContext.java
@@ -50,8 +50,7 @@ public class JPAFunctionContext extends JPAMethodContext {
     private EdmMapping mapping;
 
     @Override
-    public JPAMethodContext build() throws ODataJPAModelException,
-        ODataJPARuntimeException {
+    public JPAMethodContext build() throws ODataJPAModelException, ODataJPARuntimeException {
       if (functiontView != null) {
 
         functionImport = functiontView.getFunctionImport();
@@ -63,57 +62,39 @@ public class JPAFunctionContext extends JPAMethodContext {
           setJpaFunction(jpaFunctionList);
           setEnclosingObject(generateEnclosingObject());
         } catch (EdmException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (InstantiationException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (IllegalAccessException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (IllegalArgumentException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (InvocationTargetException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (NoSuchMethodException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         } catch (SecurityException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         }
       }
 
       return JPAFunctionContext.this;
     }
 
-    private JPAFunction generateJPAFunction() throws EdmException,
-        NoSuchMethodException, SecurityException,
-        ODataJPAModelException, ODataJPARuntimeException {
+    private JPAFunction generateJPAFunction() throws EdmException, NoSuchMethodException, SecurityException, ODataJPAModelException, ODataJPARuntimeException {
 
       Class<?>[] parameterTypes = getParameterTypes();
       Method method = getMethod(parameterTypes);
       Type returnType = getReturnType();
       Object[] args = getAruguments();
 
-      JPAFunction jpafunction = new JPAFunction(method, parameterTypes,
-          returnType, args);
+      JPAFunction jpafunction = new JPAFunction(method, parameterTypes, returnType, args);
 
       return jpafunction;
     }
 
     private Object[] getAruguments() throws EdmException {
-      Map<String, EdmLiteral> edmArguements = functiontView
-          .getFunctionImportParameters();
+      Map<String, EdmLiteral> edmArguements = functiontView.getFunctionImportParameters();
 
       if (edmArguements == null) {
         return null;
@@ -122,12 +103,9 @@ public class JPAFunctionContext extends JPAMethodContext {
         int i = 0;
         for (String paramName : functionImport.getParameterNames()) {
           EdmLiteral literal = edmArguements.get(paramName);
-          EdmParameter parameter = functionImport
-              .getParameter(paramName);
-          JPAEdmMapping mapping = (JPAEdmMapping) parameter
-              .getMapping();
-          args[i] = convertArguement(literal, parameter.getFacets(),
-              mapping.getJPAType());
+          EdmParameter parameter = functionImport.getParameter(paramName);
+          JPAEdmMapping mapping = (JPAEdmMapping) parameter.getMapping();
+          args[i] = convertArguement(literal, parameter.getFacets(), mapping.getJPAType());
           i++;
         }
         return args;
@@ -135,34 +113,27 @@ public class JPAFunctionContext extends JPAMethodContext {
 
     }
 
-    private Object convertArguement(final EdmLiteral edmLiteral,
-        final EdmFacets facets, final Class<?> targetType)
-        throws EdmSimpleTypeException {
+    private Object convertArguement(final EdmLiteral edmLiteral, final EdmFacets facets, final Class<?> targetType) throws EdmSimpleTypeException {
       EdmSimpleType edmType = edmLiteral.getType();
-      Object value = edmType.valueOfString(edmLiteral.getLiteral(),
-          EdmLiteralKind.DEFAULT, facets, targetType);
+      Object value = edmType.valueOfString(edmLiteral.getLiteral(), EdmLiteralKind.DEFAULT, facets, targetType);
 
       return value;
     }
 
     private Class<?>[] getParameterTypes() throws EdmException {
 
-      Class<?>[] parameterTypes = new Class<?>[functionImport
-          .getParameterNames().size()];
+      Class<?>[] parameterTypes = new Class<?>[functionImport.getParameterNames().size()];
       int i = 0;
       for (String parameterName : functionImport.getParameterNames()) {
-        EdmParameter parameter = functionImport
-            .getParameter(parameterName);
-        parameterTypes[i] = ((JPAEdmMapping) parameter.getMapping())
-            .getJPAType();
+        EdmParameter parameter = functionImport.getParameter(parameterName);
+        parameterTypes[i] = ((JPAEdmMapping) parameter.getMapping()).getJPAType();
         i++;
       }
 
       return parameterTypes;
     }
 
-    private Method getMethod(final Class<?>[] parameterTypes)
-        throws NoSuchMethodException, SecurityException {
+    private Method getMethod(final Class<?>[] parameterTypes) throws NoSuchMethodException, SecurityException {
 
       Class<?> type = ((JPAEdmMapping) mapping).getJPAType();
       Method method;
@@ -171,15 +142,11 @@ public class JPAFunctionContext extends JPAMethodContext {
       return method;
     }
 
-    private Type getReturnType() throws ODataJPAModelException,
-        ODataJPARuntimeException, EdmException {
+    private Type getReturnType() throws ODataJPAModelException, ODataJPARuntimeException, EdmException {
       return null;
     }
 
-    private Object generateEnclosingObject() throws InstantiationException,
-        IllegalAccessException, IllegalArgumentException,
-        InvocationTargetException, NoSuchMethodException,
-        SecurityException {
+    private Object generateEnclosingObject() throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException {
 
       Class<?> type = ((JPAEdmMapping) mapping).getJPAType();
       Object[] params = null;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
index 5ff10b0..b0c942b 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/data/JPAProcessorImpl.java
@@ -65,49 +65,35 @@ public class JPAProcessorImpl implements JPAProcessor {
   /* Process Function Import Request */
   @SuppressWarnings("unchecked")
   @Override
-  public List<Object> process(final GetFunctionImportUriInfo uriParserResultView)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public List<Object> process(final GetFunctionImportUriInfo uriParserResultView) throws ODataJPAModelException, ODataJPARuntimeException {
 
-    JPAMethodContext jpaMethodContext = JPAMethodContext.createBuilder(
-        JPQLContextType.FUNCTION, uriParserResultView).build();
+    JPAMethodContext jpaMethodContext = JPAMethodContext.createBuilder(JPQLContextType.FUNCTION, uriParserResultView).build();
 
     List<Object> resultObj = null;
 
     try {
 
-      JPAFunction jpaFunction = jpaMethodContext.getJPAFunctionList()
-          .get(0);
+      JPAFunction jpaFunction = jpaMethodContext.getJPAFunctionList().get(0);
       Method method = jpaFunction.getFunction();
       Object[] args = jpaFunction.getArguments();
 
-      if (uriParserResultView.getFunctionImport().getReturnType()
-          .getMultiplicity().equals(EdmMultiplicity.MANY)) {
+      if (uriParserResultView.getFunctionImport().getReturnType().getMultiplicity().equals(EdmMultiplicity.MANY)) {
 
-        resultObj = (List<Object>) method.invoke(
-            jpaMethodContext.getEnclosingObject(), args);
+        resultObj = (List<Object>) method.invoke(jpaMethodContext.getEnclosingObject(), args);
       } else {
         resultObj = new ArrayList<Object>();
-        Object result = method.invoke(
-            jpaMethodContext.getEnclosingObject(), args);
+        Object result = method.invoke(jpaMethodContext.getEnclosingObject(), args);
         resultObj.add(result);
       }
 
     } catch (EdmException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalAccessException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     } catch (InvocationTargetException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getTargetException().getMessage()), e.getTargetException());
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getTargetException().getMessage()), e.getTargetException());
     }
 
     return resultObj;
@@ -116,31 +102,26 @@ public class JPAProcessorImpl implements JPAProcessor {
   /* Process Get Entity Set Request (Query) */
   @SuppressWarnings("unchecked")
   @Override
-  public <T> List<T> process(final GetEntitySetUriInfo uriParserResultView)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public <T> List<T> process(final GetEntitySetUriInfo uriParserResultView) throws ODataJPAModelException, ODataJPARuntimeException {
 
     if (uriParserResultView.getFunctionImport() != null) {
       return (List<T>) process((GetFunctionImportUriInfo) uriParserResultView);
     }
     JPQLContextType contextType = null;
     try {
-      if (!uriParserResultView.getStartEntitySet().getName()
-          .equals(uriParserResultView.getTargetEntitySet().getName())) {
+      if (!uriParserResultView.getStartEntitySet().getName().equals(uriParserResultView.getTargetEntitySet().getName())) {
         contextType = JPQLContextType.JOIN;
       } else {
         contextType = JPQLContextType.SELECT;
       }
 
     } catch (EdmException e) {
-      ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.GENERAL, e);
+      ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
     }
 
-    JPQLContext jpqlContext = JPQLContext.createBuilder(contextType,
-        uriParserResultView).build();
+    JPQLContext jpqlContext = JPQLContext.createBuilder(contextType, uriParserResultView).build();
 
-    JPQLStatement jpqlStatement = JPQLStatement.createBuilder(jpqlContext)
-        .build();
+    JPQLStatement jpqlStatement = JPQLStatement.createBuilder(jpqlContext).build();
     Query query = null;
     try {
       query = em.createQuery(jpqlStatement.toString());
@@ -159,30 +140,26 @@ public class JPAProcessorImpl implements JPAProcessor {
       }
       return query.getResultList();
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
     }
   }
 
   /* Process Get Entity Request (Read) */
   @Override
-  public <T> Object process(GetEntityUriInfo uriParserResultView)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public <T> Object process(GetEntityUriInfo uriParserResultView) throws ODataJPAModelException, ODataJPARuntimeException {
 
     JPQLContextType contextType = null;
     try {
       if (uriParserResultView instanceof GetEntityUriInfo) {
         uriParserResultView = ((GetEntityUriInfo) uriParserResultView);
-        if (!((GetEntityUriInfo) uriParserResultView).getStartEntitySet().getName()
-            .equals(((GetEntityUriInfo) uriParserResultView).getTargetEntitySet().getName())) {
+        if (!((GetEntityUriInfo) uriParserResultView).getStartEntitySet().getName().equals(((GetEntityUriInfo) uriParserResultView).getTargetEntitySet().getName())) {
           contextType = JPQLContextType.JOIN_SINGLE;
         } else {
           contextType = JPQLContextType.SELECT_SINGLE;
         }
       }
     } catch (EdmException e) {
-      ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.GENERAL, e);
+      ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
     }
 
     return readEntity(uriParserResultView, contextType);
@@ -190,27 +167,22 @@ public class JPAProcessorImpl implements JPAProcessor {
 
   /* Process $count for Get Entity Set Request */
   @Override
-  public long process(final GetEntitySetCountUriInfo resultsView)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public long process(final GetEntitySetCountUriInfo resultsView) throws ODataJPAModelException, ODataJPARuntimeException {
 
     JPQLContextType contextType = null;
     try {
-      if (!resultsView.getStartEntitySet().getName()
-          .equals(resultsView.getTargetEntitySet().getName())) {
+      if (!resultsView.getStartEntitySet().getName().equals(resultsView.getTargetEntitySet().getName())) {
         contextType = JPQLContextType.JOIN_COUNT;
       } else {
         contextType = JPQLContextType.SELECT_COUNT;
       }
     } catch (EdmException e) {
-      ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.GENERAL, e);
+      ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
     }
 
-    JPQLContext jpqlContext = JPQLContext.createBuilder(contextType,
-        resultsView).build();
+    JPQLContext jpqlContext = JPQLContext.createBuilder(contextType, resultsView).build();
 
-    JPQLStatement jpqlStatement = JPQLStatement.createBuilder(jpqlContext)
-        .build();
+    JPQLStatement jpqlStatement = JPQLStatement.createBuilder(jpqlContext).build();
     Query query = null;
     try {
 
@@ -220,8 +192,7 @@ public class JPAProcessorImpl implements JPAProcessor {
         return Long.valueOf(resultList.get(0).toString());
       }
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
     }
     return 0;
   }
@@ -232,22 +203,18 @@ public class JPAProcessorImpl implements JPAProcessor {
 
     JPQLContextType contextType = null;
     try {
-      if (!resultsView.getStartEntitySet().getName()
-          .equals(resultsView.getTargetEntitySet().getName())) {
+      if (!resultsView.getStartEntitySet().getName().equals(resultsView.getTargetEntitySet().getName())) {
         contextType = JPQLContextType.JOIN_COUNT;
       } else {
         contextType = JPQLContextType.SELECT_COUNT;
       }
     } catch (EdmException e) {
-      ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.GENERAL, e);
+      ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
     }
 
-    JPQLContext jpqlContext = JPQLContext.createBuilder(contextType,
-        resultsView).build();
+    JPQLContext jpqlContext = JPQLContext.createBuilder(contextType, resultsView).build();
 
-    JPQLStatement jpqlStatement = JPQLStatement.createBuilder(jpqlContext)
-        .build();
+    JPQLStatement jpqlStatement = JPQLStatement.createBuilder(jpqlContext).build();
     Query query = null;
     try {
 
@@ -257,8 +224,7 @@ public class JPAProcessorImpl implements JPAProcessor {
         return Long.valueOf(resultList.get(0).toString());
       }
     } catch (IllegalArgumentException e) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
     }
 
     return 0;
@@ -266,14 +232,10 @@ public class JPAProcessorImpl implements JPAProcessor {
 
   /* Process Create Entity Request */
   @Override
-  public <T> List<T> process(final PostUriInfo createView, final InputStream content,
-      final String requestedContentType) throws ODataJPAModelException,
-      ODataJPARuntimeException {
-
-    JPACreateRequest jpaCreateRequest = new JPACreateRequest(em
-        .getEntityManagerFactory().getMetamodel());
-    List<T> createObjectList = jpaCreateRequest.process(createView, content,
-        requestedContentType);
+  public <T> List<T> process(final PostUriInfo createView, final InputStream content, final String requestedContentType) throws ODataJPAModelException, ODataJPARuntimeException {
+
+    JPACreateRequest jpaCreateRequest = new JPACreateRequest(em.getEntityManagerFactory().getMetamodel());
+    List<T> createObjectList = jpaCreateRequest.process(createView, content, requestedContentType);
     try {
       em.getTransaction().begin();
       Object jpaEntity = createObjectList.get(0);
@@ -288,68 +250,58 @@ public class JPAProcessorImpl implements JPAProcessor {
       }
     } catch (Exception e) {
       em.getTransaction().rollback();
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.ERROR_JPQL_CREATE_REQUEST, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_CREATE_REQUEST, e);
     }
     return null;
   }
 
   /* Process Update Entity Request */
   @Override
-  public <T> Object process(PutMergePatchUriInfo updateView,
-      final InputStream content, final String requestContentType)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public <T> Object process(PutMergePatchUriInfo updateView, final InputStream content, final String requestContentType) throws ODataJPAModelException, ODataJPARuntimeException {
 
     JPQLContextType contextType = null;
     try {
       if (updateView instanceof PutMergePatchUriInfo) {
         updateView = ((PutMergePatchUriInfo) updateView);
-        if (!((PutMergePatchUriInfo) updateView).getStartEntitySet().getName()
-            .equals(((PutMergePatchUriInfo) updateView).getTargetEntitySet().getName())) {
+        if (!((PutMergePatchUriInfo) updateView).getStartEntitySet().getName().equals(((PutMergePatchUriInfo) updateView).getTargetEntitySet().getName())) {
           contextType = JPQLContextType.JOIN_SINGLE;
         } else {
           contextType = JPQLContextType.SELECT_SINGLE;
         }
       }
     } catch (EdmException e) {
-      ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.GENERAL, e);
+      ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
     }
 
     JPAUpdateRequest jpaUpdateRequest = new JPAUpdateRequest();
     Object updateObject = readEntity(updateView, contextType);
     try {
       em.getTransaction().begin();
-      jpaUpdateRequest.process(updateObject, updateView, content,
-          requestContentType);
+      jpaUpdateRequest.process(updateObject, updateView, content, requestContentType);
       em.flush();
       em.getTransaction().commit();
     } catch (Exception e) {
       em.getTransaction().rollback();
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.ERROR_JPQL_UPDATE_REQUEST, e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_UPDATE_REQUEST, e);
     }
     return updateObject;
   }
 
   /* Process Delete Entity Request */
   @Override
-  public Object process(DeleteUriInfo uriParserResultView, final String contentType)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public Object process(DeleteUriInfo uriParserResultView, final String contentType) throws ODataJPAModelException, ODataJPARuntimeException {
     JPQLContextType contextType = null;
     try {
       if (uriParserResultView instanceof DeleteUriInfo) {
         uriParserResultView = ((DeleteUriInfo) uriParserResultView);
-        if (!((DeleteUriInfo) uriParserResultView).getStartEntitySet().getName()
-            .equals(((DeleteUriInfo) uriParserResultView).getTargetEntitySet().getName())) {
+        if (!((DeleteUriInfo) uriParserResultView).getStartEntitySet().getName().equals(((DeleteUriInfo) uriParserResultView).getTargetEntitySet().getName())) {
           contextType = JPQLContextType.JOIN_SINGLE;
         } else {
           contextType = JPQLContextType.SELECT_SINGLE;
         }
       }
     } catch (EdmException e) {
-      ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.GENERAL, e);
+      ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL, e);
     }
 
     // First read the entity with read operation.
@@ -363,8 +315,7 @@ public class JPAProcessorImpl implements JPAProcessor {
         em.getTransaction().commit();
       } catch (Exception e) {
         em.getTransaction().rollback();
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.ERROR_JPQL_DELETE_REQUEST, e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_DELETE_REQUEST, e);
       }
     }
     return selectedObject;
@@ -372,41 +323,34 @@ public class JPAProcessorImpl implements JPAProcessor {
 
   /* Process Get Entity Link Request */
   @Override
-  public Object process(final GetEntityLinkUriInfo uriParserResultView)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public Object process(final GetEntityLinkUriInfo uriParserResultView) throws ODataJPAModelException, ODataJPARuntimeException {
 
     return this.process((GetEntityUriInfo) uriParserResultView);
   }
 
   /* Process Get Entity Set Link Request */
   @Override
-  public <T> List<T> process(final GetEntitySetLinksUriInfo uriParserResultView)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  public <T> List<T> process(final GetEntitySetLinksUriInfo uriParserResultView) throws ODataJPAModelException, ODataJPARuntimeException {
     return this.process((GetEntitySetUriInfo) uriParserResultView);
   }
 
   @Override
-  public void process(final PostUriInfo uriInfo,
-      final InputStream content, final String requestContentType, final String contentType)
-      throws ODataJPARuntimeException, ODataJPAModelException {
+  public void process(final PostUriInfo uriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
     JPALink link = new JPALink(oDataJPAContext);
     link.create(uriInfo, content, requestContentType, contentType);
     link.save();
   }
 
   /* Common method for Read and Delete */
-  private Object readEntity(final Object uriParserResultView, final JPQLContextType contextType)
-      throws ODataJPAModelException, ODataJPARuntimeException {
+  private Object readEntity(final Object uriParserResultView, final JPQLContextType contextType) throws ODataJPAModelException, ODataJPARuntimeException {
 
     Object selectedObject = null;
 
     if (uriParserResultView instanceof DeleteUriInfo || uriParserResultView instanceof GetEntityUriInfo || uriParserResultView instanceof PutMergePatchUriInfo) {
 
-      JPQLContext selectJPQLContext = JPQLContext.createBuilder(
-          contextType, uriParserResultView).build();
+      JPQLContext selectJPQLContext = JPQLContext.createBuilder(contextType, uriParserResultView).build();
 
-      JPQLStatement selectJPQLStatement = JPQLStatement.createBuilder(
-          selectJPQLContext).build();
+      JPQLStatement selectJPQLStatement = JPQLStatement.createBuilder(selectJPQLContext).build();
       Query query = null;
       try {
         query = em.createQuery(selectJPQLStatement.toString());
@@ -414,17 +358,14 @@ public class JPAProcessorImpl implements JPAProcessor {
           selectedObject = query.getResultList().get(0);
         }
       } catch (IllegalArgumentException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQL_QUERY_CREATE, e);
       }
     }
     return selectedObject;
   }
 
   @Override
-  public void process(final PutMergePatchUriInfo putUriInfo,
-      final InputStream content, final String requestContentType, final String contentType)
-      throws ODataJPARuntimeException, ODataJPAModelException {
+  public void process(final PutMergePatchUriInfo putUriInfo, final InputStream content, final String requestContentType, final String contentType) throws ODataJPARuntimeException, ODataJPAModelException {
     JPALink link = new JPALink(oDataJPAContext);
     link.update(putUriInfo, content, requestContentType, contentType);
     link.save();

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
index fb07fb7..ae9dcf0 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/access/model/EdmTypeConvertor.java
@@ -33,46 +33,34 @@ public class EdmTypeConvertor {
 
   public static Class<?> convertToJavaType(final EdmType edmType) throws ODataJPAModelException, ODataJPARuntimeException {
     if (edmType instanceof EdmSimpleType) {
-        EdmSimpleType edmSimpleType = (EdmSimpleType) edmType;
-        if (edmSimpleType == EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()) {
-          return String.class;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance()) {
-          return Long.TYPE;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance()) {
-          return Short.TYPE;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance()) {
-          return Integer.TYPE;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance()) {
-          return Double.TYPE;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance()) {
-          return Float.TYPE;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Decimal.getEdmSimpleTypeInstance()) {
-          return BigDecimal.class;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance()) {
-          return byte[].class;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Byte.getEdmSimpleTypeInstance()) {
-          return Byte.TYPE;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance()) {
-          return Boolean.TYPE;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance()) {
-          return Date.class;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
-          return Calendar.class;
-        }
-        else if (edmSimpleType == EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance()) {
-          return UUID.class;
-        }
+      EdmSimpleType edmSimpleType = (EdmSimpleType) edmType;
+      if (edmSimpleType == EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()) {
+        return String.class;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance()) {
+        return Long.TYPE;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Int16.getEdmSimpleTypeInstance()) {
+        return Short.TYPE;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Int32.getEdmSimpleTypeInstance()) {
+        return Integer.TYPE;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Double.getEdmSimpleTypeInstance()) {
+        return Double.TYPE;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Single.getEdmSimpleTypeInstance()) {
+        return Float.TYPE;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Decimal.getEdmSimpleTypeInstance()) {
+        return BigDecimal.class;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance()) {
+        return byte[].class;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Byte.getEdmSimpleTypeInstance()) {
+        return Byte.TYPE;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Boolean.getEdmSimpleTypeInstance()) {
+        return Boolean.TYPE;
+      } else if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance()) {
+        return Date.class;
+      } else if (edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
+        return Calendar.class;
+      } else if (edmSimpleType == EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance()) {
+        return UUID.class;
+      }
     }
     throw ODataJPAModelException.throwException(ODataJPAModelException.TYPE_NOT_SUPPORTED.addContent(edmType.toString()), null);
   }


[04/22] remove @author - javadoc warning

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
index 45d162e..9f5b183 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonFeedConsumerTest.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.ep.feed.ODataFeed;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonFeedConsumerTest extends AbstractConsumerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
index 061311c..1861f3b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonLinkConsumerTest.java
@@ -30,7 +30,7 @@ import com.google.gson.stream.JsonReader;
 import org.apache.olingo.odata2.api.ep.EntityProviderException;
 
 /**
- * @author
+ *  
  */
 public class JsonLinkConsumerTest extends AbstractConsumerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
index ed0539a..5cedb91 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonPropertyConsumerTest.java
@@ -51,7 +51,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonPropertyConsumerTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
index 2df3d4f..57e7f68 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlEntityConsumerTest.java
@@ -62,7 +62,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class XmlEntityConsumerTest extends AbstractConsumerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
index b4a48a1..d0256a1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlLinkConsumerTest.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.edm.Edm;
 import org.apache.olingo.odata2.api.ep.EntityProviderException;
 
 /**
- * @author
+ *  
  */
 public class XmlLinkConsumerTest extends AbstractConsumerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
index c47c5ff..805f29e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/XmlPropertyConsumerTest.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderException;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class XmlPropertyConsumerTest extends AbstractConsumerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
index 9252c71..2156c81 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomEntryProducerTest.java
@@ -64,7 +64,7 @@ import org.apache.olingo.odata2.testutil.helper.XMLUnitHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class AtomEntryProducerTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
index 11dc2c1..8b9c228 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/AtomFeedProducerTest.java
@@ -46,7 +46,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class AtomFeedProducerTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
index 031ab90..5223c16 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonEntryEntityProducerTest.java
@@ -57,7 +57,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonEntryEntityProducerTest extends BaseTest {
   protected static final String BASE_URI = "http://host:80/service/";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
index 48a2c92..c405a10 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonErrorProducerTest.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.core.ep.ProviderFacadeImpl;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class JsonErrorProducerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
index 57650a2..97fa72b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFeedEntityProducerTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonFeedEntityProducerTest extends BaseTest {
   protected static final String BASE_URI = "http://host:80/service/";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
index b8e03e3..6c900b5 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonFunctionImportTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonFunctionImportTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
index 0f4ea02..6d2652e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinkEntityProducerTest.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonLinkEntityProducerTest extends BaseTest {
   protected static final String BASE_URI = "http://host:80/service/";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
index cc12312..0beba8d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonLinksEntityProducerTest.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonLinksEntityProducerTest extends BaseTest {
   protected static final String BASE_URI = "http://host:80/service/";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
index 728dac0..6a9a306 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonPropertyProducerTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonPropertyProducerTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
index 5e4f02f..53b83d9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/JsonServiceDocumentProducerTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class JsonServiceDocumentProducerTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
index 2df9c3e..364a8ae 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/MyCallback.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.core.ep.AbstractProviderTest;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class MyCallback implements OnWriteEntryContent, OnWriteFeedContent {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
index 632f0fc..20403e8 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlErrorProducerTest.java
@@ -49,7 +49,7 @@ import org.apache.olingo.odata2.core.ep.ProviderFacadeImpl;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class XmlErrorProducerTest extends AbstractXmlProducerTestHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
index 7346340..ad6a3d5 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlFunctionImportTest.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class XmlFunctionImportTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
index fee28dd..cf251e3 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducerTest.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class XmlLinkEntityProducerTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
index 9fc2ba7..a670b36 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducerTest.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class XmlLinksEntityProducerTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
index e6e9c2c..ff09f1b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyProducerTest.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.testutil.helper.XMLUnitHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class XmlPropertyProducerTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
index 7a2d366..cb8dbb6 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/producer/XmlSelectProducerTest.java
@@ -52,7 +52,7 @@ import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class XmlSelectProducerTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
index dc750e0..c1c09e1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBufferTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class CircleStreamBufferTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
index c7d8cb8..e5a74bd 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriterTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class JsonStreamWriterTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
index 0444369..983ad65 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageReferenceTest.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.uri.UriNotMatchingException;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class MessageReferenceTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
index b144c0f..56d1d89 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/MessageServiceTest.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.core.exception.MessageService.Message;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class MessageServiceTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
index 2b2f8b6..b0d67f9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataExceptionTest.java
@@ -53,7 +53,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.helper.ODataMessageTextVerifier;
 
 /**
- * @author
+ *  
  */
 public class ODataExceptionTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
index 028f548..8b123d0 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/exception/ODataMessageTextVerifierTest.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.testutil.mock.SampleClassForInvalidMessageRefere
 /**
  * This class tests the {@link ODataMessageTextVerifier}
  * 
- * @author
+ *  
  */
 public class ODataMessageTextVerifierTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
index d299aa1..0bf7e82 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorServiceTest.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.commons.ContentType;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class ODataSingleProcessorServiceTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
index a849881..a036783 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImplTest.java
@@ -63,7 +63,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class ODataExceptionMapperImplTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
index 5fa3e10..44c3f9d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreatorImplTest.java
@@ -43,7 +43,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class ExpandSelectTreeCreatorImplTest extends BaseTest {
   private static Edm edm;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
index df4d840..6151e50 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/QueryOptionsEnumTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class QueryOptionsEnumTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
index 109670c..2d16dea 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriInfoTest.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class UriInfoTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
index 6913176..c06dfe9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserFacadeTest.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class UriParserFacadeTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
index fd25c61..1cd3997 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/UriParserTest.java
@@ -55,7 +55,7 @@ import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
  * Tests for OData URI parsing.
- * @author
+ *  
  */
 public class UriParserTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
index aaefc14..7786c58 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImplTool.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.edm.EdmEntityType;
 import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
 
 /**
- * @author
+ *  
  */
 public class FilterParserImplTool extends FilterParserImpl {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
index f9c0033..5cc94b0 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/FilterToJsonTest.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
 import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
 
 /**
- * @author
+ *  
  */
 public class FilterToJsonTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
index fe42677..044d6d8 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/ParserTool.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.core.exception.MessageService;
 import org.apache.olingo.odata2.core.exception.MessageService.Message;
 
 /**
- * @author
+ *  
  */
 public class ParserTool {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
index cf71f1a..4eb2d61 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestAbapCompatibility.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.core.edm.EdmTime;
 import org.apache.olingo.odata2.core.edm.Uint7;
 
 /**
- * @author
+ *  
  * Differences to ABAP Parser
  * - for $orderBy it the sortorder (asc/desc) not case insensitive anymore, so ASC/DESC is not allowed 
  * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
index f854b08..2c1cec8 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestBase.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.testutil.mock.TecEdmInfo;
 import org.apache.olingo.odata2.testutil.mock.TechnicalScenarioEdmProvider;
 
 /**
- * @author
+ *  
  */
 public class TestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
index 6597f58..2621fa6 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestExceptionTexts.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionParserException;
 import org.apache.olingo.odata2.testutil.helper.ODataMessageTextVerifier;
 
 /**
- * @author
+ *  
  */
 public class TestExceptionTexts extends TestBase {
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
index 6a50061..a920f1c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParser.java
@@ -54,7 +54,7 @@ import org.apache.olingo.odata2.core.edm.Uint7;
 import org.apache.olingo.odata2.core.edm.provider.EdmComplexPropertyImplProv;
 
 /**
- * @author
+ *  
  */
 public class TestParser extends TestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
index 0b148d6..49e2b72 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestParserExceptions.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionKind;
 import org.apache.olingo.odata2.api.uri.expression.ExpressionParserException;
 
 /**
- * @author
+ *  
  */
 public class TestParserExceptions extends TestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
index ce7e47a..6b0e48f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/uri/expression/TestSpec.java
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.core.edm.Uint7;
 import org.apache.olingo.odata2.core.edm.provider.EdmComplexPropertyImplProv;
 
 /**
- * @author
+ *  
  */
 public class TestSpec extends TestBase
 {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
index 0dffa24..15e8a20 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AbstractBasicTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
 import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
 
 /**
- * @author
+ *  
  */
 public abstract class AbstractBasicTest extends AbstractFitTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
index f094858..eb9b56d 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/AcceptHeaderTypeTest.java
@@ -44,7 +44,7 @@ import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
 import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
 
 /**
- * @author
+ *  
  */
 public class AcceptHeaderTypeTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
index 5e1b30f..8d7b846 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicBatchTest.java
@@ -62,7 +62,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class BasicBatchTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
index ae7cadb..0b08d76 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/BasicHttpTest.java
@@ -55,7 +55,7 @@ import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class BasicHttpTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
index cbf292b..79a3854 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContentNegotiationDollarFormatTest.java
@@ -43,7 +43,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class ContentNegotiationDollarFormatTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
index bd66acf..f3b754c 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ContextTest.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
 import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
 
 /**
- * @author
+ *  
  */
 public class ContextTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
index 72f0acb..e02d7f2 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ErrorResponseTest.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class ErrorResponseTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
index f00db57..a40747d 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ExceptionsTest.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class ExceptionsTest extends AbstractBasicTest {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
index 6672b9b..3462fd3 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/FitLoadTest.java
@@ -42,7 +42,7 @@ import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
 import org.apache.olingo.odata2.api.uri.info.GetServiceDocumentUriInfo;
 
 /**
- * @author
+ *  
  */
 public class FitLoadTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
index 45f215e..f0c40d2 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/HttpExceptionResponseTest.java
@@ -56,7 +56,7 @@ import org.apache.olingo.odata2.testutil.helper.ClassHelper;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class HttpExceptionResponseTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
index 8c27687..48b0368 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/LanguageNegotiationTest.java
@@ -51,7 +51,7 @@ import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class LanguageNegotiationTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
index b527a18..932eeeb 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/MetadataTest.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class MetadataTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
index c32dfe3..d41ec44 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/RequestContentTypeTest.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.processor.ODataSingleProcessor;
 import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
 
 /**
- * @author
+ *  
  */
 public class RequestContentTypeTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
index 807184f..156e019 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/ServiceResolutionTest.java
@@ -58,7 +58,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.server.TestServer;
 
 /**
- * @author
+ *  
  */
 public class ServiceResolutionTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
index 0af5678..08683f4 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/UrlRewriteTest.java
@@ -51,7 +51,7 @@ import org.apache.olingo.odata2.testutil.helper.HttpSomethingUnsupported;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class UrlRewriteTest extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
index 48b8cb7..c136552 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/basic/issues/TestIssue105.java
@@ -42,7 +42,7 @@ import org.apache.olingo.odata2.api.uri.info.GetMetadataUriInfo;
 import org.apache.olingo.odata2.fit.basic.AbstractBasicTest;
 
 /**
- * @author
+ *  
  */
 public class TestIssue105 extends AbstractBasicTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
index 87f9d79..d7ee2c4 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MapFactory.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
 import org.apache.olingo.odata2.api.processor.ODataContext;
 
 /**
- * @author
+ *  
  */
 public class MapFactory extends ODataServiceFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
index f6c8266..e701efd 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/mapping/MappingTest.java
@@ -44,7 +44,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.server.TestServer;
 
 /**
- * @author
+ *  
  */
 public class MappingTest extends AbstractFitTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
index 11d5c35..cd22356 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefJsonTest.java
@@ -23,7 +23,7 @@ import com.google.gson.internal.StringMap;
 import com.google.gson.reflect.TypeToken;
 
 /**
- * @author
+ *  
  */
 public class AbstractRefJsonTest extends AbstractRefTest {
   public StringMap<?> getStringMap(final String body) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
index 118bbd9..45d9e34 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefTest.java
@@ -51,7 +51,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
  * Abstract base class for tests employing the reference scenario.
- * @author
+ *  
  */
 public class AbstractRefTest extends AbstractFitTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
index 644f9a8..48ba3f0 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/AbstractRefXmlTest.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.api.edm.Edm;
 
 /**
  * Abstract base class for tests employing the reference scenario reading or writing XML.
- * @author
+ *  
  */
 public class AbstractRefXmlTest extends AbstractRefTest {
   @Before

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
index 85cd210..1614b5c 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/BatchTest.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
  * 
- * @author
+ *  
  */
 public class BatchTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
index 25a01d4..969f345 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ContentNegotiationTest.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
- * @author
+ *  
  */
 public class ContentNegotiationTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
index 4ac0863..2b3f7a8 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/DataServiceVersionTest.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.api.commons.ODataHttpHeaders;
 
 /**
- * @author
+ *  
  */
 public class DataServiceVersionTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
index 2251741..770372f 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonChangeTest.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Tests employing the reference scenario changing entities in JSON format.
- * @author
+ *  
  */
 public class EntryJsonChangeTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
index fa30420..7609d00 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateInlineTest.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
- * @author
+ *  
  */
 public class EntryJsonCreateInlineTest extends AbstractRefJsonTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
index 6eb2183..0d2f37b 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonCreateTest.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
- * @author
+ *  
  */
 public class EntryJsonCreateTest extends AbstractRefJsonTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
index bdfc57e..9711fa9 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryJsonReadOnlyTest.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 
 /**
  * Tests employing the reference scenario reading a single entity in JSON format.
- * @author
+ *  
  */
 public class EntryJsonReadOnlyTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
index e78ae12..d2407ba 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlChangeTest.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
  * Tests employing the reference scenario changing entities in XML format.
- * @author
+ *  
  */
 public class EntryXmlChangeTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
index b611ccd..51bdf14 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlCreateTest.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Tests employing the reference scenario changing entities in XML format.
- * @author
+ *  
  */
 public class EntryXmlCreateTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
index 9d067e7..913f5f1 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/EntryXmlReadOnlyTest.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.ref.processor.ScenarioDataSource;
 
 /**
  * Tests employing the reference scenario reading a single entity in XML format.
- * @author
+ *  
  */
 public class EntryXmlReadOnlyTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
index b568cd4..2f1aeeb 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedJsonReadOnlyTest.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 
 /**
  * Tests employing the reference scenario reading entity sets in JSON format.
- * @author
+ *  
  */
 public class FeedJsonReadOnlyTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
index a05b64b..7e21881 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FeedXmlReadOnlyTest.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Tests employing the reference scenario reading entity sets in XML format.
- * @author
+ *  
  */
 public class FeedXmlReadOnlyTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
index 3c6522e..00cdd0d 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportJsonTest.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.commons.HttpHeaders;
 
 /**
  * Tests employing the reference scenario reading function-import output in JSON format.
- * @author
+ *  
  */
 public class FunctionImportJsonTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
index d5bce4e..fb11b42 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/FunctionImportXmlTest.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.commons.HttpHeaders;
 
 /**
  * Tests employing the reference scenario reading function-import output in XML format.
- * @author
+ *  
  */
 public class FunctionImportXmlTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
index 0419291..0c07944 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonChangeTest.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Tests employing the reference scenario changing links in JSON format.
- * @author
+ *  
  */
 public final class LinksJsonChangeTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
index 2f5437e..a6425c7 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksJsonReadOnlyTest.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 
 /**
  * Tests employing the reference scenario reading links in JSON format.
- * @author
+ *  
  */
 public final class LinksJsonReadOnlyTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
index 7a60999..1a71b79 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlChangeTest.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.edm.Edm;
 
 /**
  * Tests employing the reference scenario changing links in XML format.
- * @author
+ *  
  */
 public final class LinksXmlChangeTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
index 9d2cfa9..4fdf877 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/LinksXmlReadOnlyTest.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 
 /**
  * Tests employing the reference scenario reading links in XML format
- * @author
+ *  
  */
 public final class LinksXmlReadOnlyTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
index 2d52d10..30c8e37 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MetadataTest.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 
 /**
  * Tests employing the reference scenario reading the metadata document in XML format
- * @author
+ *  
  */
 public class MetadataTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
index e0e0932..1576337 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscChangeTest.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.commons.ODataHttpMethod;
 /**
  * Tests employing the reference scenario that use neither XML nor JSON
  * and that change data in some way
- * @author
+ *  
  */
 public class MiscChangeTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
index cab5124..e99f13e 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/MiscReadOnlyTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 /**
  * Read-only tests employing the reference scenario that use neither XML nor JSON
- * @author
+ *  
  */
 public class MiscReadOnlyTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
index c952de2..de119aa 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonChangeTest.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Tests employing the reference scenario changing properties in JSON format.
- * @author
+ *  
  */
 public class PropertyJsonChangeTest extends AbstractRefTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
index 770831c..3d57223 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyJsonReadOnlyTest.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.commons.HttpContentType;
 
 /**
  * Tests employing the reference scenario reading properties in JSON format.
- * @author
+ *  
  */
 public class PropertyJsonReadOnlyTest extends AbstractRefTest {
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
index 810ce3c..b8bdca2 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlChangeTest.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.edm.Edm;
 
 /**
  * Tests employing the reference scenario changing properties in XML format
- * @author
+ *  
  */
 public class PropertyXmlChangeTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
index 6fe1429..79fce6e 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/PropertyXmlReadOnlyTest.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Tests employing the reference scenario reading properties in XML format.
- * @author
+ *  
  */
 public class PropertyXmlReadOnlyTest extends AbstractRefXmlTest {
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
index 1ebbabf..d819c95 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceJsonTest.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.api.edm.Edm;
 
 /**
  * Tests employing the reference scenario reading the service document in JSON format.
- * @author
+ *  
  */
 public class ServiceJsonTest extends AbstractRefTest {
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
index 6e454fe..2a70fc0 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/ServiceXmlTest.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 
 /**
  * Tests employing the reference scenario reading the service document in XML format
- * @author
+ *  
  */
 public class ServiceXmlTest extends AbstractRefXmlTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
index 8bdcf63..e7ec48b 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/AbstractContentNegotiationTest.java
@@ -63,7 +63,7 @@ import org.apache.olingo.odata2.testutil.fit.AbstractFitTest;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public abstract class AbstractContentNegotiationTest extends AbstractFitTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
index 3a0b251..8c3c92e 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationGetRequestTest.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.core.uri.UriType;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 @Ignore
 public class ContentNegotiationGetRequestTest extends AbstractContentNegotiationTest {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
----------------------------------------------------------------------
diff --git a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
index a9be946..29916b6 100644
--- a/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
+++ b/odata-fit/src/test/java/org/apache/olingo/odata2/fit/ref/contentnegotiation/ContentNegotiationPostRequestTest.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.commons.HttpStatusCodes;
 import org.apache.olingo.odata2.core.uri.UriType;
 
 /**
- * @author
+ *  
  */
 public class ContentNegotiationPostRequestTest extends AbstractContentNegotiationTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
index 6d93f28..70509d0 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/edm/ScenarioEdmProvider.java
@@ -54,7 +54,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
 
 /**
  * Provider for the entity data model used in the reference scenario
- * @author
+ *  
  */
 public class ScenarioEdmProvider extends EdmProvider {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
index 1c40c52..0dd567b 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Building.java
@@ -23,7 +23,7 @@ import java.util.Arrays;
 import java.util.List;
 
 /**
- * @author
+ *  
  */
 public class Building {
   private final int id;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
index 067cda3..714fc79 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/City.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.odata2.ref.model;
 
 /**
- * @author
+ *  
  */
 public class City {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
index ba3fd10..3baef62 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/DataContainer.java
@@ -25,7 +25,7 @@ import java.util.TimeZone;
 
 /**
  * Container and initialization code for the data objects of the reference scenario.
- * @author
+ *  
  */
 public class DataContainer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
index b9de4d5..f794c41 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Employee.java
@@ -25,7 +25,7 @@ import java.text.DateFormat;
 import java.util.Calendar;
 
 /**
- * @author
+ *  
  */
 public class Employee {
   private int employeeId;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
----------------------------------------------------------------------
diff --git a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
index 1509dca..aa577b5 100644
--- a/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
+++ b/odata-ref/src/main/java/org/apache/olingo/odata2/ref/model/Location.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.odata2.ref.model;
 
 /**
- * @author
+ *  
  */
 public class Location {
   private String country;


[22/22] git commit: eliminate checkstyle warnings

Posted by sk...@apache.org.
eliminate checkstyle warnings


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

Branch: refs/heads/master
Commit: 1e5280b7471faca08b46baffd3e750e7aed17906
Parents: 420c1b7
Author: Stephan Klevenz <st...@sap.com>
Authored: Wed Jul 31 10:12:20 2013 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Wed Jul 31 10:12:20 2013 +0200

----------------------------------------------------------------------
 .../processor/api/jpa/ODataJPAProcessor.java    |   6 +-
 .../api/jpa/ODataJPAServiceFactory.java         |  31 +-
 .../jpa/access/JPAEdmMappingModelAccess.java    |  18 +-
 .../processor/api/jpa/access/JPAFunction.java   |   3 +-
 .../processor/api/jpa/access/JPAJoinClause.java |   4 +-
 .../api/jpa/access/JPAMethodContext.java        |  20 +-
 .../processor/api/jpa/access/JPAProcessor.java  |  40 +-
 .../api/jpa/access/JPAProcessorOperation.java   |   6 +-
 .../api/jpa/exception/ODataJPAException.java    |   3 +-
 .../jpa/exception/ODataJPAModelException.java   |  58 +-
 .../jpa/exception/ODataJPARuntimeException.java |  64 +-
 .../api/jpa/factory/JPAAccessFactory.java       |   3 +-
 .../api/jpa/factory/JPQLBuilderFactory.java     |   3 +-
 .../api/jpa/factory/ODataJPAAccessFactory.java  |   3 +-
 .../processor/api/jpa/jpql/JPQLContext.java     |  18 +-
 .../jpql/JPQLJoinSelectSingleContextView.java   |   3 +-
 .../processor/api/jpa/jpql/JPQLStatement.java   |   9 +-
 .../api/jpa/model/JPAEdmAssociationView.java    |   3 +-
 .../api/jpa/model/JPAEdmComplexTypeView.java    |   3 +-
 .../jpa/model/mapping/JPAAttributeMapType.java  |   8 +-
 .../model/mapping/JPAEmbeddableTypeMapType.java |   5 +-
 .../jpa/model/mapping/JPAEntityTypeMapType.java |   7 +-
 .../mapping/JPAPersistenceUnitMapType.java      |   3 +-
 .../processor/core/jpa/ODataEntityParser.java   |  28 +-
 .../core/jpa/ODataExpressionParser.java         |  43 +-
 .../core/jpa/ODataJPAProcessorDefault.java      |  96 +-
 .../core/jpa/ODataJPAResponseBuilder.java       | 302 ++----
 .../core/jpa/access/data/JPAEntityParser.java   | 189 +---
 .../core/jpa/access/data/JPAExpandCallBack.java |  27 +-
 .../jpa/access/data/JPAFunctionContext.java     |  77 +-
 .../core/jpa/access/data/JPAProcessorImpl.java  | 163 +--
 .../core/jpa/access/model/EdmTypeConvertor.java |  68 +-
 .../access/model/JPAEdmMappingModelService.java |  58 +-
 .../jpa/access/model/JPAEdmNameBuilder.java     | 172 ++--
 .../core/jpa/access/model/JPATypeConvertor.java |  42 +-
 .../core/jpa/cud/JPACreateRequest.java          | 163 +--
 .../odata2/processor/core/jpa/cud/JPALink.java  |  89 +-
 .../core/jpa/cud/JPAUpdateRequest.java          |  52 +-
 .../processor/core/jpa/cud/JPAWriteRequest.java |  44 +-
 .../core/jpa/edm/ODataJPAEdmProvider.java       |  72 +-
 .../ODataJPAMessageServiceDefault.java          |  16 +-
 .../core/jpa/factory/ODataJPAFactoryImpl.java   |  27 +-
 .../core/jpa/jpql/JPQLJoinSelectContext.java    |  61 +-
 .../jpa/jpql/JPQLJoinSelectSingleContext.java   |  59 +-
 .../JPQLJoinSelectSingleStatementBuilder.java   |  28 +-
 .../core/jpa/jpql/JPQLJoinStatementBuilder.java |  47 +-
 .../core/jpa/jpql/JPQLSelectContext.java        |  32 +-
 .../core/jpa/jpql/JPQLSelectSingleContext.java  |  11 +-
 .../jpql/JPQLSelectSingleStatementBuilder.java  |  12 +-
 .../jpa/jpql/JPQLSelectStatementBuilder.java    |   6 +-
 .../core/jpa/model/JPAEdmAssociation.java       | 101 +-
 .../core/jpa/model/JPAEdmAssociationEnd.java    |  38 +-
 .../core/jpa/model/JPAEdmAssociationSet.java    |  24 +-
 .../core/jpa/model/JPAEdmBaseViewImpl.java      |   3 +-
 .../core/jpa/model/JPAEdmComplexType.java       |  26 +-
 .../core/jpa/model/JPAEdmEntityContainer.java   |  19 +-
 .../core/jpa/model/JPAEdmEntitySet.java         |   9 +-
 .../core/jpa/model/JPAEdmEntityType.java        |  34 +-
 .../core/jpa/model/JPAEdmFunctionImport.java    | 113 +--
 .../processor/core/jpa/model/JPAEdmKey.java     |   7 +-
 .../jpa/model/JPAEdmNavigationProperty.java     |  15 +-
 .../core/jpa/model/JPAEdmProperty.java          |  95 +-
 .../jpa/model/JPAEdmReferentialConstraint.java  |  32 +-
 .../model/JPAEdmReferentialConstraintRole.java  |  51 +-
 .../processor/core/jpa/model/JPAEdmSchema.java  |  54 +-
 .../processor/core/jpa/JPAEntityParserTest.java | 223 ++---
 .../core/jpa/ODataJPAContextImplTest.java       |  13 +-
 .../core/jpa/ODataJPAProcessorDefaultTest.java  | 112 +--
 .../core/jpa/ODataJPAResponseBuilderTest.java   | 327 ++-----
 .../jpa/access/data/JPAExpandCallBackTest.java  |  66 +-
 .../jpa/access/data/JPAFunctionContextTest.java |  45 +-
 .../jpa/access/data/JPAProcessorImplTest.java   |  67 +-
 .../access/data/ODataExpressionParserTest.java  | 299 ++----
 .../core/jpa/access/data/TestUtil.java          | 159 +--
 .../model/JPAEdmMappingModelServiceTest.java    |   3 +-
 .../jpa/access/model/JPAEdmNameBuilderTest.java |  11 +-
 .../jpa/access/model/JPATypeConvertorTest.java  |  36 +-
 .../core/jpa/cud/JPACreateRequestTest.java      | 114 +--
 .../processor/core/jpa/cud/JPATestUtil.java     | 114 +--
 .../core/jpa/cud/JPAUpdateRequestTest.java      |   9 +-
 .../core/jpa/cud/SalesOrderHeader.java          |   3 +-
 .../edm/ODataJPAEdmProviderNegativeTest.java    |  87 +-
 .../core/jpa/edm/ODataJPAEdmProviderTest.java   | 217 ++--
 .../core/jpa/jpql/JPQLBuilderFactoryTest.java   | 128 +--
 .../core/jpa/jpql/JPQLJoinContextTest.java      |  19 +-
 .../jpql/JPQLJoinSelectSingleContextTest.java   |  17 +-
 ...PQLJoinSelectSingleStatementBuilderTest.java |  11 +-
 .../jpa/jpql/JPQLJoinStatementBuilderTest.java  |  11 +-
 .../jpa/jpql/JPQLSelectContextImplTest.java     | 185 ++--
 .../jpql/JPQLSelectSingleContextImplTest.java   |  59 +-
 .../JPQLSelectSingleStatementBuilderTest.java   |  19 +-
 .../jpql/JPQLSelectStatementBuilderTest.java    |   7 +-
 .../core/jpa/mock/ODataJPAContextMock.java      |   6 +-
 .../core/jpa/mock/model/EdmSchemaMock.java      |  17 +-
 .../jpa/mock/model/JPACustomProcessorMock.java  |   8 +-
 .../core/jpa/mock/model/JPAEdmMockData.java     |  15 +-
 .../core/jpa/mock/model/JPAEmbeddableMock.java  |  18 +-
 .../jpa/mock/model/JPAEmbeddableTypeMock.java   |  18 +-
 .../core/jpa/mock/model/JPAEntityTypeMock.java  |  18 +-
 .../core/jpa/mock/model/JPAJavaMemberMock.java  |   3 +-
 .../core/jpa/mock/model/JPAManagedTypeMock.java |  18 +-
 .../jpa/model/JPAEdmAssociationEndTest.java     |  29 +-
 .../jpa/model/JPAEdmAssociationSetTest.java     |   5 +-
 .../core/jpa/model/JPAEdmAssociationTest.java   |  60 +-
 .../core/jpa/model/JPAEdmBaseViewImplTest.java  |   5 +-
 .../core/jpa/model/JPAEdmComplexTypeTest.java   |  35 +-
 .../jpa/model/JPAEdmEntityContainerTest.java    |  14 +-
 .../core/jpa/model/JPAEdmEntitySetTest.java     |  14 +-
 .../core/jpa/model/JPAEdmEntityTypeTest.java    |  14 +-
 .../jpa/model/JPAEdmFunctionImportTest.java     | 153 +--
 .../processor/core/jpa/model/JPAEdmKeyTest.java |  33 +-
 .../core/jpa/model/JPAEdmModelTest.java         |  17 +-
 .../jpa/model/JPAEdmNavigationPropertyTest.java |  42 +-
 .../core/jpa/model/JPAEdmPropertyTest.java      |  39 +-
 .../JPAEdmReferentialConstraintRoleTest.java    |  47 +-
 .../model/JPAEdmReferentialConstraintTest.java  |  38 +-
 .../core/jpa/model/JPAEdmSchemaTest.java        |   5 +-
 .../core/jpa/model/JPAEdmTestModelView.java     |  19 +-
 .../olingo/odata2/core/ODataRequestHandler.java |  78 +-
 .../odata2/core/batch/BatchRequestParser.java   | 138 ++-
 .../olingo/odata2/core/commons/Encoder.java     |  39 +-
 .../core/uri/expression/FilterParserImpl.java   |   3 +-
 .../odata2/core/uri/expression/JsonVisitor.java |  58 +-
 .../odata2/core/edm/parser/EdmParserTest.java   | 979 ++-----------------
 .../uri/expression/FilterParserImplTool.java    |   6 +-
 .../core/uri/expression/FilterToJsonTest.java   |   8 +-
 .../odata2/core/uri/expression/ParserTool.java  |  10 +-
 .../uri/expression/TestAbapCompatibility.java   |  15 +-
 .../odata2/core/uri/expression/TestBase.java    |   6 +-
 .../core/uri/expression/TestExceptionTexts.java |   3 +-
 .../odata2/core/uri/expression/TestParser.java  | 177 ++--
 .../uri/expression/TestParserExceptions.java    | 215 ++--
 .../odata2/core/uri/expression/TestSpec.java    |  37 +-
 .../core/uri/expression/TestTokenizer.java      | 141 +--
 .../odata2/core/uri/expression/TokenTool.java   | 101 +-
 .../odata2/core/uri/expression/VisitorTool.java |  30 +-
 .../helper/ODataMessageTextVerifier.java        |   3 +-
 .../olingo/odata2/testutil/mock/TecEdmInfo.java |   8 +-
 .../mock/TechnicalScenarioEdmProvider.java      |  78 +-
 139 files changed, 2306 insertions(+), 5804 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
index d97bfd4..4513445 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAProcessor.java
@@ -63,12 +63,10 @@ public abstract class ODataJPAProcessor extends ODataSingleProcessor {
    */
   public ODataJPAProcessor(final ODataJPAContext oDataJPAContext) {
     if (oDataJPAContext == null) {
-      throw new IllegalArgumentException(
-          ODataJPAException.ODATA_JPACTX_NULL);
+      throw new IllegalArgumentException(ODataJPAException.ODATA_JPACTX_NULL);
     }
     this.oDataJPAContext = oDataJPAContext;
-    jpaProcessor = ODataJPAFactory.createFactory().getJPAAccessFactory()
-        .getJPAProcessor(this.oDataJPAContext);
+    jpaProcessor = ODataJPAFactory.createFactory().getJPAAccessFactory().getJPAProcessor(this.oDataJPAContext);
   }
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
index bc9b69d..e4c71a9 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/ODataJPAServiceFactory.java
@@ -86,8 +86,7 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
    * {@link org.apache.olingo.odata2.api.processor.ODataContext}.
    */
   @Override
-  public final ODataService createService(final ODataContext ctx)
-      throws ODataException {
+  public final ODataService createService(final ODataContext ctx) throws ODataException {
 
     oDataContext = ctx;
 
@@ -97,19 +96,17 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
     validatePreConditions();
 
     ODataJPAFactory factory = ODataJPAFactory.createFactory();
-    ODataJPAAccessFactory accessFactory = factory
-        .getODataJPAAccessFactory();
+    ODataJPAAccessFactory accessFactory = factory.getODataJPAAccessFactory();
 
     // OData JPA Processor
-    if (oDataJPAContext.getODataContext() == null)
+    if (oDataJPAContext.getODataContext() == null) {
       oDataJPAContext.setODataContext(ctx);
+    }
 
-    ODataSingleProcessor odataJPAProcessor = accessFactory
-        .createODataProcessor(oDataJPAContext);
+    ODataSingleProcessor odataJPAProcessor = accessFactory.createODataProcessor(oDataJPAContext);
 
     // OData Entity Data Model Provider based on JPA
-    EdmProvider edmProvider = accessFactory
-        .createJPAEdmProvider(oDataJPAContext);
+    EdmProvider edmProvider = accessFactory.createJPAEdmProvider(oDataJPAContext);
 
     return createODataSingleProcessorService(edmProvider, odataJPAProcessor);
   }
@@ -117,9 +114,7 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
   private void validatePreConditions() throws ODataJPARuntimeException {
 
     if (oDataJPAContext.getEntityManagerFactory() == null) {
-      throw ODataJPARuntimeException.throwException(
-          ODataJPARuntimeException.ENTITY_MANAGER_NOT_INITIALIZED,
-          null);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ENTITY_MANAGER_NOT_INITIALIZED, null);
     }
 
   }
@@ -152,21 +147,19 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
    *         {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
    * @throws ODataJPARuntimeException
    */
-  public abstract ODataJPAContext initializeODataJPAContext()
-      throws ODataJPARuntimeException;
+  public abstract ODataJPAContext initializeODataJPAContext() throws ODataJPARuntimeException;
 
   /**
    * @return an instance of type {@link ODataJPAContext}
    * @throws ODataJPARuntimeException
    */
-  public final ODataJPAContext getODataJPAContext()
-      throws ODataJPARuntimeException {
+  public final ODataJPAContext getODataJPAContext() throws ODataJPARuntimeException {
     if (oDataJPAContext == null) {
-      oDataJPAContext = ODataJPAFactory.createFactory()
-          .getODataJPAAccessFactory().createODataJPAContext();
+      oDataJPAContext = ODataJPAFactory.createFactory().getODataJPAAccessFactory().createODataJPAContext();
     }
-    if (oDataContext != null)
+    if (oDataContext != null) {
       oDataJPAContext.setODataContext(oDataContext);
+    }
     return oDataJPAContext;
 
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
index 0c8601a..59ca79a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAEdmMappingModelAccess.java
@@ -99,8 +99,7 @@ public interface JPAEdmMappingModelAccess {
    * @return EDM property name mapped to Java persistence attribute name or
    *         null if no mapping is available
    */
-  public String mapJPAAttribute(String jpaEntityTypeName,
-      String jpaAttributeName);
+  public String mapJPAAttribute(String jpaEntityTypeName, String jpaAttributeName);
 
   /**
    * The method returns EDM navigation property name for the Java persistence
@@ -113,8 +112,7 @@ public interface JPAEdmMappingModelAccess {
    * @return EDM navigation property name mapped to Java persistence entity
    *         relationship name or null if no mapping is available
    */
-  public String mapJPARelationship(String jpaEntityTypeName,
-      String jpaRelationshipName);
+  public String mapJPARelationship(String jpaEntityTypeName, String jpaRelationshipName);
 
   /**
    * The method returns EDM complex type name for the Java embeddable type
@@ -138,8 +136,7 @@ public interface JPAEdmMappingModelAccess {
    * @return EDM property name mapped to Java persistence attribute name or
    *         null if no mapping is available
    */
-  public String mapJPAEmbeddableTypeAttribute(String jpaEmbeddableTypeName,
-      String jpaAttributeName);
+  public String mapJPAEmbeddableTypeAttribute(String jpaEmbeddableTypeName, String jpaAttributeName);
 
   /**
    * The method returns whether the JPA Entity should be excluded from EDM
@@ -165,8 +162,7 @@ public interface JPAEdmMappingModelAccess {
    *         <b>false</b> - if JPA attribute should be not be excluded
    * 
    */
-  public boolean checkExclusionOfJPAAttributeType(String jpaEntityTypeName,
-      String jpaAttributeName);
+  public boolean checkExclusionOfJPAAttributeType(String jpaEntityTypeName, String jpaAttributeName);
 
   /**
    * The method returns whether the JPA Embeddable Type should be excluded
@@ -178,8 +174,7 @@ public interface JPAEdmMappingModelAccess {
    *         <b>false</b> - if JPA Embeddable Type should be not be excluded
    * 
    */
-  public boolean checkExclusionOfJPAEmbeddableType(
-      String jpaEmbeddableTypeName);
+  public boolean checkExclusionOfJPAEmbeddableType(String jpaEmbeddableTypeName);
 
   /**
    * The method returns whether the JPA Embeddable Attribute Type should be
@@ -194,6 +189,5 @@ public interface JPAEdmMappingModelAccess {
    *         excluded
    * 
    */
-  public boolean checkExclusionOfJPAEmbeddableAttributeType(
-      String jpaEmbeddableTypeName, String jpaAttributeName);
+  public boolean checkExclusionOfJPAEmbeddableAttributeType(String jpaEmbeddableTypeName, String jpaAttributeName);
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
index 6ddf274..2da8d63 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAFunction.java
@@ -38,8 +38,7 @@ public class JPAFunction {
   private Type returnType;
   private Object[] args;
 
-  public JPAFunction(final Method function, final Class<?>[] parameterTypes,
-      final Type returnType, final Object[] args) {
+  public JPAFunction(final Method function, final Class<?>[] parameterTypes, final Type returnType, final Object[] args) {
     this.function = function;
     this.parameterTypes = parameterTypes;
     this.returnType = returnType;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
index b65605d..2c57474 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAJoinClause.java
@@ -116,9 +116,7 @@ public class JPAJoinClause {
    *            {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN}
    *            to execute
    */
-  public JPAJoinClause(final String entityName, final String entityAlias,
-      final String entityRelationShip, final String entityRelationShipAlias,
-      final String joinCondition, final JOIN joinType) {
+  public JPAJoinClause(final String entityName, final String entityAlias, final String entityRelationShip, final String entityRelationShipAlias, final String joinCondition, final JOIN joinType) {
 
     this.entityName = entityName;
     this.entityAlias = entityAlias;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
index d7a091a..1f0f14c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAMethodContext.java
@@ -88,9 +88,7 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
    * 
    * @throws ODataJPARuntimeException
    */
-  public final static JPAMethodContextBuilder createBuilder(
-      final JPQLContextType contextType, final Object resultsView)
-      throws ODataJPARuntimeException {
+  public final static JPAMethodContextBuilder createBuilder(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
     return JPAMethodContextBuilder.create(contextType, resultsView);
   }
 
@@ -110,23 +108,15 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
      * @throws ODataJPAModelException
      * @throws ODataJPARuntimeException
      */
-    public abstract JPAMethodContext build() throws ODataJPAModelException,
-        ODataJPARuntimeException;
+    public abstract JPAMethodContext build() throws ODataJPAModelException, ODataJPARuntimeException;
 
     protected JPAMethodContextBuilder() {}
 
-    private static JPAMethodContextBuilder create(
-        final JPQLContextType contextType, final Object resultsView)
-        throws ODataJPARuntimeException {
-      JPAMethodContextBuilder contextBuilder = ODataJPAFactory
-          .createFactory().getJPQLBuilderFactory()
-          .getJPAMethodContextBuilder(contextType);
+    private static JPAMethodContextBuilder create(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
+      JPAMethodContextBuilder contextBuilder = ODataJPAFactory.createFactory().getJPQLBuilderFactory().getJPAMethodContextBuilder(contextType);
 
       if (contextBuilder == null) {
-        throw ODataJPARuntimeException
-            .throwException(
-                ODataJPARuntimeException.ERROR_JPQLCTXBLDR_CREATE,
-                null);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQLCTXBLDR_CREATE, null);
       }
       contextBuilder.setResultsView(resultsView);
       return contextBuilder;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
index a5e12a5..d40ec4c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessor.java
@@ -57,8 +57,7 @@ public interface JPAProcessor {
    *            <p>
    * @return list of objects representing JPA entity types
    **/
-  public <T> List<T> process(GetEntitySetUriInfo requestView)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public <T> List<T> process(GetEntitySetUriInfo requestView) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for reading an Entity. The method returns an
@@ -76,8 +75,7 @@ public interface JPAProcessor {
    *            <p>
    * @return object representing JPA entity type
    **/
-  public <T> Object process(GetEntityUriInfo requestView)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public <T> Object process(GetEntityUriInfo requestView) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for fetching Entity count. The method returns JPA Entity count
@@ -90,8 +88,7 @@ public interface JPAProcessor {
    * @throws ODataJPARuntimeException
    */
 
-  public long process(GetEntitySetCountUriInfo requestView)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public long process(GetEntitySetCountUriInfo requestView) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for fetching Entity count. The method returns count of target entity.
@@ -104,8 +101,7 @@ public interface JPAProcessor {
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
    */
-  public long process(GetEntityCountUriInfo resultsView)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public long process(GetEntityCountUriInfo resultsView) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for creating Entity. The method returns an Object
@@ -121,9 +117,7 @@ public interface JPAProcessor {
    * @throws ODataJPARuntimeException
    */
 
-  public <T> List<T> process(PostUriInfo createView, InputStream content,
-      String requestContentType) throws ODataJPAModelException,
-      ODataJPARuntimeException;
+  public <T> List<T> process(PostUriInfo createView, InputStream content, String requestContentType) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for updating Entity. The method returns an Object
@@ -136,9 +130,7 @@ public interface JPAProcessor {
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
    */
-  public <T> Object process(PutMergePatchUriInfo updateView,
-      InputStream content, String requestContentType)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public <T> Object process(PutMergePatchUriInfo updateView, InputStream content, String requestContentType) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for deleting Entity. The method returns an Object
@@ -151,8 +143,7 @@ public interface JPAProcessor {
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
    */
-  public Object process(DeleteUriInfo deleteuriInfo, String contentType)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public Object process(DeleteUriInfo deleteuriInfo, String contentType) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for executing custom operations. The method
@@ -165,8 +156,7 @@ public interface JPAProcessor {
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
    */
-  public List<Object> process(GetFunctionImportUriInfo requestView)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public List<Object> process(GetFunctionImportUriInfo requestView) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for executing $links OData command for N:1 relation. 
@@ -178,8 +168,7 @@ public interface JPAProcessor {
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
    */
-  public Object process(GetEntityLinkUriInfo uriParserResultView)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public Object process(GetEntityLinkUriInfo uriParserResultView) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Processes OData request for executing $links OData command for N:1 relation. 
@@ -191,8 +180,7 @@ public interface JPAProcessor {
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
    */
-  public <T> List<T> process(GetEntitySetLinksUriInfo uriParserResultView)
-      throws ODataJPAModelException, ODataJPARuntimeException;
+  public <T> List<T> process(GetEntitySetLinksUriInfo uriParserResultView) throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
    * Process OData request for creating Links. The OData request should contain
@@ -207,9 +195,7 @@ public interface JPAProcessor {
    * @throws ODataJPARuntimeException
    * @throws ODataJPAModelException
    */
-  public void process(PostUriInfo uriParserResultView,
-      InputStream content, String requestContentType, String contentType)
-      throws ODataJPARuntimeException, ODataJPAModelException;
+  public void process(PostUriInfo uriParserResultView, InputStream content, String requestContentType, String contentType) throws ODataJPARuntimeException, ODataJPAModelException;
 
   /**
    * Process OData request for updating Links. The OData request should contain
@@ -224,7 +210,5 @@ public interface JPAProcessor {
    * @throws ODataJPARuntimeException
    * @throws ODataJPAModelException
    */
-  public void process(PutMergePatchUriInfo uriParserResultView,
-      InputStream content, String requestContentType, String contentType)
-      throws ODataJPARuntimeException, ODataJPAModelException;
+  public void process(PutMergePatchUriInfo uriParserResultView, InputStream content, String requestContentType, String contentType) throws ODataJPARuntimeException, ODataJPAModelException;
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorOperation.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorOperation.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorOperation.java
index 219bbf7..7ee0df9 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorOperation.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/access/JPAProcessorOperation.java
@@ -19,9 +19,5 @@
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
 public enum JPAProcessorOperation {
-  Read,
-  Query,
-  Create,
-  Update,
-  Delete
+  Read, Query, Create, Update, Delete
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
index d6e622f..cc6eec4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAException.java
@@ -58,8 +58,7 @@ public abstract class ODataJPAException extends ODataException {
    * @return an instance of type
    *         {@link org.apache.olingo.odata2.api.exception.MessageReference}
    */
-  protected static MessageReference createMessageReference(
-      final Class<? extends ODataJPAException> clazz, final String messageReferenceKey) {
+  protected static MessageReference createMessageReference(final Class<? extends ODataJPAException> clazz, final String messageReferenceKey) {
     return MessageReference.create(clazz, messageReferenceKey);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
index a7d77db..b3790fa 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPAModelException.java
@@ -30,40 +30,24 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  */
 public class ODataJPAModelException extends ODataJPAException {
 
-  public static final MessageReference INVALID_ENTITY_TYPE = createMessageReference(
-      ODataJPAModelException.class, "INVALID_ENTITY_TYPE");
-  public static final MessageReference INVALID_COMPLEX_TYPE = createMessageReference(
-      ODataJPAModelException.class, "INVLAID_COMPLEX_TYPE");
-  public static final MessageReference INVALID_ASSOCIATION = createMessageReference(
-      ODataJPAModelException.class, "INVALID_ASSOCIATION");
-  public static final MessageReference INVALID_ENTITYSET = createMessageReference(
-      ODataJPAModelException.class, "INVALID_ENTITYSET");
-  public static final MessageReference INVALID_ENTITYCONTAINER = createMessageReference(
-      ODataJPAModelException.class, "INVALID_ENTITYCONTAINER");
-  public static final MessageReference INVALID_ASSOCIATION_SET = createMessageReference(
-      ODataJPAModelException.class, "INVALID_ASSOCIATION_SET");
-  public static final MessageReference INVALID_FUNC_IMPORT = createMessageReference(
-      ODataJPAModelException.class, "INVALID_FUNC_IMPORT");
+  public static final MessageReference INVALID_ENTITY_TYPE = createMessageReference(ODataJPAModelException.class, "INVALID_ENTITY_TYPE");
+  public static final MessageReference INVALID_COMPLEX_TYPE = createMessageReference(ODataJPAModelException.class, "INVLAID_COMPLEX_TYPE");
+  public static final MessageReference INVALID_ASSOCIATION = createMessageReference(ODataJPAModelException.class, "INVALID_ASSOCIATION");
+  public static final MessageReference INVALID_ENTITYSET = createMessageReference(ODataJPAModelException.class, "INVALID_ENTITYSET");
+  public static final MessageReference INVALID_ENTITYCONTAINER = createMessageReference(ODataJPAModelException.class, "INVALID_ENTITYCONTAINER");
+  public static final MessageReference INVALID_ASSOCIATION_SET = createMessageReference(ODataJPAModelException.class, "INVALID_ASSOCIATION_SET");
+  public static final MessageReference INVALID_FUNC_IMPORT = createMessageReference(ODataJPAModelException.class, "INVALID_FUNC_IMPORT");
 
-  public static final MessageReference BUILDER_NULL = createMessageReference(
-      ODataJPAModelException.class, "BUILDER_NULL");
-  public static final MessageReference TYPE_NOT_SUPPORTED = createMessageReference(
-      ODataJPAModelException.class, "TYPE_NOT_SUPPORTED");
-  public static final MessageReference FUNC_ENTITYSET_EXP = createMessageReference(
-      ODataJPAModelException.class, "FUNC_ENTITYSET_EXP");
-  public static final MessageReference FUNC_RETURN_TYPE_EXP = createMessageReference(
-      ODataJPAModelException.class, "FUNC_RETURN_TYPE_EXP");
-  public static final MessageReference FUNC_RETURN_TYPE_ENTITY_NOT_FOUND = createMessageReference(
-      ODataJPAModelException.class, "FUNC_RETURN_TYPE_ENTITY_NOT_FOUND");
-  public static final MessageReference GENERAL = createMessageReference(
-      ODataJPAModelException.class, "GENERAL");
-  public static final MessageReference INNER_EXCEPTION = createMessageReference(
-      ODataJPAModelException.class, "INNER_EXCEPTION");
-  public static final MessageReference FUNC_PARAM_NAME_EXP = createMessageReference(
-      ODataJPAModelException.class, "FUNC_PARAM_NAME_EXP");
+  public static final MessageReference BUILDER_NULL = createMessageReference(ODataJPAModelException.class, "BUILDER_NULL");
+  public static final MessageReference TYPE_NOT_SUPPORTED = createMessageReference(ODataJPAModelException.class, "TYPE_NOT_SUPPORTED");
+  public static final MessageReference FUNC_ENTITYSET_EXP = createMessageReference(ODataJPAModelException.class, "FUNC_ENTITYSET_EXP");
+  public static final MessageReference FUNC_RETURN_TYPE_EXP = createMessageReference(ODataJPAModelException.class, "FUNC_RETURN_TYPE_EXP");
+  public static final MessageReference FUNC_RETURN_TYPE_ENTITY_NOT_FOUND = createMessageReference(ODataJPAModelException.class, "FUNC_RETURN_TYPE_ENTITY_NOT_FOUND");
+  public static final MessageReference GENERAL = createMessageReference(ODataJPAModelException.class, "GENERAL");
+  public static final MessageReference INNER_EXCEPTION = createMessageReference(ODataJPAModelException.class, "INNER_EXCEPTION");
+  public static final MessageReference FUNC_PARAM_NAME_EXP = createMessageReference(ODataJPAModelException.class, "FUNC_PARAM_NAME_EXP");
 
-  private ODataJPAModelException(final String localizedMessage, final Throwable e,
-      final MessageReference msgRef) {
+  private ODataJPAModelException(final String localizedMessage, final Throwable e, final MessageReference msgRef) {
     super(localizedMessage, e, msgRef);
   }
 
@@ -80,15 +64,11 @@ public class ODataJPAModelException extends ODataJPAException {
    * @return an instance of ODataJPAModelException which can be then raised.
    * @throws ODataJPARuntimeException
    */
-  public static ODataJPAModelException throwException(
-      final MessageReference messageReference, final Throwable e) {
+  public static ODataJPAModelException throwException(final MessageReference messageReference, final Throwable e) {
 
     ODataJPAMessageService messageService;
-    messageService = ODataJPAFactory.createFactory()
-        .getODataJPAAccessFactory()
-        .getODataJPAMessageService(DEFAULT_LOCALE);
-    String message = messageService
-        .getLocalizedMessage(messageReference, e);
+    messageService = ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
+    String message = messageService.getLocalizedMessage(messageReference, e);
     return new ODataJPAModelException(message, e, messageReference);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
index a83c9fe..34721a0 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/exception/ODataJPARuntimeException.java
@@ -33,43 +33,25 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  */
 public class ODataJPARuntimeException extends ODataJPAException {
 
-  public static final MessageReference ENTITY_MANAGER_NOT_INITIALIZED = createMessageReference(
-      ODataJPARuntimeException.class, "ENTITY_MANAGER_NOT_INITIALIZED");
-  public static final MessageReference RESOURCE_NOT_FOUND = createMessageReference(
-      ODataJPARuntimeException.class, "RESOURCE_NOT_FOUND");
-  public static final MessageReference GENERAL = createMessageReference(
-      ODataJPARuntimeException.class, "GENERAL");
-  public static final MessageReference INNER_EXCEPTION = createMessageReference(
-      ODataJPARuntimeException.class, "INNER_EXCEPTION");
-  public static final MessageReference JOIN_CLAUSE_EXPECTED = createMessageReference(
-      ODataJPARuntimeException.class, "JOIN_CLAUSE_EXPECTED");
-  public static final MessageReference ERROR_JPQLCTXBLDR_CREATE = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQLCTXBLDR_CREATE");
-  public static final MessageReference ERROR_ODATA_FILTER_CONDITION = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_ODATA_FILTER_CONDITION");
-  public static final MessageReference ERROR_JPQL_QUERY_CREATE = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_QUERY_CREATE");
-  public static final MessageReference ERROR_JPQL_CREATE_REQUEST = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_CREATE_REQUEST");
-  public static final MessageReference ERROR_JPQL_UPDATE_REQUEST = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_UPDATE_REQUEST");
-  public static final MessageReference ERROR_JPQL_DELETE_REQUEST = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_DELETE_REQUEST");
-  public static final MessageReference ERROR_JPQL_KEY_VALUE = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_KEY_VALUE");
-  public static final MessageReference ERROR_JPQL_PARAM_VALUE = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_PARAM_VALUE");
-  public static final MessageReference ERROR_JPQL_UNIQUE_CONSTRAINT = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_UNIQUE_CONSTRAINT");
-  public static final MessageReference ERROR_JPQL_INTEGRITY_CONSTRAINT = createMessageReference(
-      ODataJPARuntimeException.class, "ERROR_JPQL_INTEGRITY_CONSTRAINT");
-  public static final MessageReference RELATIONSHIP_INVALID = createMessageReference(
-      ODataJPARuntimeException.class, "RELATIONSHIP_INVALID");
-  public static final MessageReference RESOURCE_X_NOT_FOUND = createMessageReference(
-      ODataJPARuntimeException.class, "RESOURCE_X_NOT_FOUND");
+  public static final MessageReference ENTITY_MANAGER_NOT_INITIALIZED = createMessageReference(ODataJPARuntimeException.class, "ENTITY_MANAGER_NOT_INITIALIZED");
+  public static final MessageReference RESOURCE_NOT_FOUND = createMessageReference(ODataJPARuntimeException.class, "RESOURCE_NOT_FOUND");
+  public static final MessageReference GENERAL = createMessageReference(ODataJPARuntimeException.class, "GENERAL");
+  public static final MessageReference INNER_EXCEPTION = createMessageReference(ODataJPARuntimeException.class, "INNER_EXCEPTION");
+  public static final MessageReference JOIN_CLAUSE_EXPECTED = createMessageReference(ODataJPARuntimeException.class, "JOIN_CLAUSE_EXPECTED");
+  public static final MessageReference ERROR_JPQLCTXBLDR_CREATE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQLCTXBLDR_CREATE");
+  public static final MessageReference ERROR_ODATA_FILTER_CONDITION = createMessageReference(ODataJPARuntimeException.class, "ERROR_ODATA_FILTER_CONDITION");
+  public static final MessageReference ERROR_JPQL_QUERY_CREATE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_QUERY_CREATE");
+  public static final MessageReference ERROR_JPQL_CREATE_REQUEST = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_CREATE_REQUEST");
+  public static final MessageReference ERROR_JPQL_UPDATE_REQUEST = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_UPDATE_REQUEST");
+  public static final MessageReference ERROR_JPQL_DELETE_REQUEST = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_DELETE_REQUEST");
+  public static final MessageReference ERROR_JPQL_KEY_VALUE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_KEY_VALUE");
+  public static final MessageReference ERROR_JPQL_PARAM_VALUE = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_PARAM_VALUE");
+  public static final MessageReference ERROR_JPQL_UNIQUE_CONSTRAINT = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_UNIQUE_CONSTRAINT");
+  public static final MessageReference ERROR_JPQL_INTEGRITY_CONSTRAINT = createMessageReference(ODataJPARuntimeException.class, "ERROR_JPQL_INTEGRITY_CONSTRAINT");
+  public static final MessageReference RELATIONSHIP_INVALID = createMessageReference(ODataJPARuntimeException.class, "RELATIONSHIP_INVALID");
+  public static final MessageReference RESOURCE_X_NOT_FOUND = createMessageReference(ODataJPARuntimeException.class, "RESOURCE_X_NOT_FOUND");
 
-  private ODataJPARuntimeException(final String localizedMessage, final Throwable e,
-      final MessageReference msgRef) {
+  private ODataJPARuntimeException(final String localizedMessage, final Throwable e, final MessageReference msgRef) {
     super(localizedMessage, e, msgRef);
   }
 
@@ -86,14 +68,10 @@ public class ODataJPARuntimeException extends ODataJPAException {
    * @return an instance of ODataJPARuntimeException which can be then raised.
    * @throws ODataJPARuntimeException
    */
-  public static ODataJPARuntimeException throwException(
-      final MessageReference messageReference, final Throwable e) {
+  public static ODataJPARuntimeException throwException(final MessageReference messageReference, final Throwable e) {
     ODataJPAMessageService messageService;
-    messageService = ODataJPAFactory.createFactory()
-        .getODataJPAAccessFactory()
-        .getODataJPAMessageService(DEFAULT_LOCALE);
-    String message = messageService
-        .getLocalizedMessage(messageReference, e);
+    messageService = ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
+    String message = messageService.getLocalizedMessage(messageReference, e);
     return new ODataJPARuntimeException(message, e, messageReference);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
index aef4337..bfe73a5 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPAAccessFactory.java
@@ -71,6 +71,5 @@ public interface JPAAccessFactory {
    * @return an instance of type
    *         {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAccess}
    */
-  public JPAEdmMappingModelAccess getJPAEdmMappingModelAccess(
-      ODataJPAContext oDataJPAContext);
+  public JPAEdmMappingModelAccess getJPAEdmMappingModelAccess(ODataJPAContext oDataJPAContext);
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
index 526c33d..ea9378f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/JPQLBuilderFactory.java
@@ -78,6 +78,5 @@ public interface JPQLBuilderFactory {
    *            parameter cannot be null.
    * @return an instance of JPAMethodContextBuilder
    */
-  public JPAMethodContextBuilder getJPAMethodContextBuilder(
-      JPQLContextType contextType);
+  public JPAMethodContextBuilder getJPAMethodContextBuilder(JPQLContextType contextType);
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
index 3b2e444..c0cf390 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/factory/ODataJPAAccessFactory.java
@@ -53,8 +53,7 @@ public interface ODataJPAAccessFactory {
    *            The context should be initialized properly and cannot be null.
    * @return An implementation of OData JPA Processor.
    */
-  public ODataSingleProcessor createODataProcessor(
-      ODataJPAContext oDataJPAContext);
+  public ODataSingleProcessor createODataProcessor(ODataJPAContext oDataJPAContext);
 
   /**
    * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
index a24402b..e0f7a55 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLContext.java
@@ -121,9 +121,7 @@ public abstract class JPQLContext implements JPQLContextView {
    *         {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
    * @throws ODataJPARuntimeException
    */
-  public final static JPQLContextBuilder createBuilder(
-      final JPQLContextType contextType, final Object resultsView)
-      throws ODataJPARuntimeException {
+  public final static JPQLContextBuilder createBuilder(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
     return JPQLContextBuilder.create(contextType, resultsView);
   }
 
@@ -155,15 +153,10 @@ public abstract class JPQLContext implements JPQLContextView {
      *         {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
      * @throws ODataJPARuntimeException
      */
-    private static JPQLContextBuilder create(final JPQLContextType contextType,
-        final Object resultsView) throws ODataJPARuntimeException {
-      JPQLContextBuilder contextBuilder = ODataJPAFactory.createFactory()
-          .getJPQLBuilderFactory().getContextBuilder(contextType);
+    private static JPQLContextBuilder create(final JPQLContextType contextType, final Object resultsView) throws ODataJPARuntimeException {
+      JPQLContextBuilder contextBuilder = ODataJPAFactory.createFactory().getJPQLBuilderFactory().getContextBuilder(contextType);
       if (contextBuilder == null) {
-        throw ODataJPARuntimeException
-            .throwException(
-                ODataJPARuntimeException.ERROR_JPQLCTXBLDR_CREATE,
-                null);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.ERROR_JPQLCTXBLDR_CREATE, null);
       }
       contextBuilder.setResultsView(resultsView);
       return contextBuilder;
@@ -179,8 +172,7 @@ public abstract class JPQLContext implements JPQLContextView {
      * @throws ODataJPAModelException
      * @throws ODataJPARuntimeException
      */
-    public abstract JPQLContext build() throws ODataJPAModelException,
-        ODataJPARuntimeException;
+    public abstract JPQLContext build() throws ODataJPAModelException, ODataJPARuntimeException;
 
     /**
      * The abstract method is implemented by specific JPQL context builder.

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
index 03d32c7..1799772 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLJoinSelectSingleContextView.java
@@ -33,8 +33,7 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause;
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectSingleContextView
  * 
  */
-public interface JPQLJoinSelectSingleContextView extends
-    JPQLSelectSingleContextView {
+public interface JPQLJoinSelectSingleContextView extends JPQLSelectSingleContextView {
 
   /**
    * The method returns a list of JPA Join Clauses. The returned list of

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
index f8736ca..6ac545b 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/jpql/JPQLStatement.java
@@ -51,8 +51,7 @@ public class JPQLStatement {
    * @return an instance of JPQL statement builder
    * @throws ODataJPARuntimeException
    */
-  public static JPQLStatementBuilder createBuilder(final JPQLContextView context)
-      throws ODataJPARuntimeException {
+  public static JPQLStatementBuilder createBuilder(final JPQLContextView context) throws ODataJPARuntimeException {
     return JPQLStatementBuilder.create(context);
   }
 
@@ -88,10 +87,8 @@ public class JPQLStatement {
 
     protected JPQLStatementBuilder() {}
 
-    private static final JPQLStatementBuilder create(final JPQLContextView context)
-        throws ODataJPARuntimeException {
-      return ODataJPAFactory.createFactory().getJPQLBuilderFactory()
-          .getStatementBuilder(context);
+    private static final JPQLStatementBuilder create(final JPQLContextView context) throws ODataJPARuntimeException {
+      return ODataJPAFactory.createFactory().getJPQLBuilderFactory().getStatementBuilder(context);
     }
 
     protected final JPQLStatement createStatement(final String statement) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
index 9420ae0..a5f56db 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmAssociationView.java
@@ -104,8 +104,7 @@ public interface JPAEdmAssociationView extends JPAEdmBaseView {
    *            of type
    *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
    */
-  public void addJPAEdmRefConstraintView(
-      JPAEdmReferentialConstraintView refView);
+  public void addJPAEdmRefConstraintView(JPAEdmReferentialConstraintView refView);
 
   /**
    * The method returns the referential constraint view that is currently

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
index 34d240a..747d020 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
@@ -113,7 +113,6 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
    *            is the name of the complex property. The name is used as the
    *            qualifier for the expanded simple property names.
    */
-  public void expandEdmComplexType(ComplexType complexType,
-      List<Property> expandedPropertyList, String embeddablePropertyName);
+  public void expandEdmComplexType(ComplexType complexType, List<Property> expandedPropertyList, String embeddablePropertyName);
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
index 6a6a071..20cb3c7 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
@@ -64,9 +64,7 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAAttributeMapType", propOrder = {
-    "jpaAttribute"
-})
+@XmlType(name = "JPAAttributeMapType", propOrder = { "jpaAttribute" })
 public class JPAAttributeMapType {
 
   @XmlElement(name = "JPAAttribute")
@@ -120,9 +118,7 @@ public class JPAAttributeMapType {
    * 
    */
   @XmlAccessorType(XmlAccessType.FIELD)
-  @XmlType(name = "", propOrder = {
-      "value"
-  })
+  @XmlType(name = "", propOrder = { "value" })
   public static class JPAAttribute {
 
     @XmlValue

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
index d9fceb8..3c6a6e8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
@@ -53,10 +53,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = {
-    "edmComplexType",
-    "jpaAttributes"
-})
+@XmlType(name = "JPAEmbeddableTypeMapType", propOrder = { "edmComplexType", "jpaAttributes" })
 public class JPAEmbeddableTypeMapType {
 
   @XmlElement(name = "EDMComplexType")

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
index 10bccde..f50a771 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEntityTypeMapType.java
@@ -55,12 +55,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAEntityTypeMapType", propOrder = {
-    "edmEntityType",
-    "edmEntitySet",
-    "jpaAttributes",
-    "jpaRelationships"
-})
+@XmlType(name = "JPAEntityTypeMapType", propOrder = { "edmEntityType", "edmEntitySet", "jpaAttributes", "jpaRelationships" })
 public class JPAEntityTypeMapType {
 
   @XmlElement(name = "EDMEntityType")

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
index 9693307..f3fcbfb 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAPersistenceUnitMapType.java
@@ -55,8 +55,7 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "JPAPersistenceUnitMapType", propOrder = {
-    "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" })
+@XmlType(name = "JPAPersistenceUnitMapType", propOrder = { "edmSchemaNamespace", "jpaEntityTypes", "jpaEmbeddableTypes" })
 public class JPAPersistenceUnitMapType {
 
   @XmlElement(name = "EDMSchemaNamespace")

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
index 500f29f..69f5a90 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataEntityParser.java
@@ -47,9 +47,7 @@ public final class ODataEntityParser {
     this.context = context;
   }
 
-  public final ODataEntry parseEntry(final EdmEntitySet entitySet,
-      final InputStream content, final String requestContentType, final boolean merge)
-      throws ODataBadRequestException {
+  public final ODataEntry parseEntry(final EdmEntitySet entitySet, final InputStream content, final String requestContentType, final boolean merge) throws ODataBadRequestException {
     return null;
 
   }
@@ -66,16 +64,13 @@ public final class ODataEntityParser {
 
       uriInfo = UriParser.parse(edm, subPathSegments, Collections.<String, String> emptyMap());
     } catch (ODataException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     return uriInfo;
   }
 
-  public final UriInfo parseLink(final EdmEntitySet entitySet, final InputStream content, final String contentType)
-      throws ODataJPARuntimeException {
+  public final UriInfo parseLink(final EdmEntitySet entitySet, final InputStream content, final String contentType) throws ODataJPARuntimeException {
 
     String uriString = null;
     UriInfo uri = null;
@@ -85,8 +80,7 @@ public final class ODataEntityParser {
       ODataContext odataContext = context.getODataContext();
       final String serviceRoot = odataContext.getPathInfo().getServiceRoot().toString();
 
-      final String path = uriString.startsWith(serviceRoot.toString()) ?
-          uriString.substring(serviceRoot.length()) : uriString;
+      final String path = uriString.startsWith(serviceRoot.toString()) ? uriString.substring(serviceRoot.length()) : uriString;
 
       final PathSegment pathSegment = new PathSegment() {
         @Override
@@ -105,17 +99,14 @@ public final class ODataEntityParser {
       uri = UriParser.parse(edm, Arrays.asList(pathSegment), Collections.<String, String> emptyMap());
 
     } catch (ODataException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     return uri;
 
   }
 
-  public List<UriInfo> parseLinks(final EdmEntitySet entitySet, final InputStream content, final String contentType)
-      throws ODataJPARuntimeException {
+  public List<UriInfo> parseLinks(final EdmEntitySet entitySet, final InputStream content, final String contentType) throws ODataJPARuntimeException {
 
     List<String> uriList = new ArrayList<String>();
     List<UriInfo> uriInfoList = new ArrayList<UriInfo>();
@@ -129,8 +120,7 @@ public final class ODataEntityParser {
       final Edm edm = odataContext.getService().getEntityDataModel();
 
       for (String uriString : uriList) {
-        final String path = uriString.startsWith(serviceRoot) ?
-            uriString.substring(length) : uriString;
+        final String path = uriString.startsWith(serviceRoot) ? uriString.substring(length) : uriString;
 
         final PathSegment pathSegment = new PathSegment() {
           @Override
@@ -150,9 +140,7 @@ public final class ODataEntityParser {
     } catch (EntityProviderException e) {
       return null;
     } catch (ODataException e) {
-      throw ODataJPARuntimeException
-          .throwException(ODataJPARuntimeException.GENERAL
-              .addContent(e.getMessage()), e);
+      throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
     }
 
     return uriInfoList;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
index 17ddec5..0fc7a3d 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataExpressionParser.java
@@ -83,8 +83,7 @@ public class ODataExpressionParser {
       case MINUS:
         if (operand.startsWith("-")) {
           return operand.substring(1);
-        }
-        else {
+        } else {
           return "-" + operand; //$NON-NLS-1$
         }
       default:
@@ -154,10 +153,8 @@ public class ODataExpressionParser {
     case METHOD:
       final MethodExpression methodExpression = (MethodExpression) whereExpression;
       String first = parseToJPAWhereExpression(methodExpression.getParameters().get(0), tableAlias);
-      final String second = methodExpression.getParameterCount() > 1 ?
-          parseToJPAWhereExpression(methodExpression.getParameters().get(1), tableAlias) : null;
-      String third = methodExpression.getParameterCount() > 2 ?
-          parseToJPAWhereExpression(methodExpression.getParameters().get(2), tableAlias) : null;
+      final String second = methodExpression.getParameterCount() > 1 ? parseToJPAWhereExpression(methodExpression.getParameters().get(1), tableAlias) : null;
+      String third = methodExpression.getParameterCount() > 2 ? parseToJPAWhereExpression(methodExpression.getParameters().get(2), tableAlias) : null;
 
       switch (methodExpression.getMethod()) {
       case SUBSTRING:
@@ -168,8 +165,7 @@ public class ODataExpressionParser {
         if (methodFlag == 1) {
           methodFlag = 0;
           return String.format("(CASE WHEN %s LIKE '%%%s%%' THEN TRUE ELSE FALSE END)", second, first);
-        }
-        else {
+        } else {
           return String.format("(CASE WHEN %s LIKE '%%%s%%' THEN TRUE ELSE FALSE END) = true", second, first);
         }
       case TOLOWER:
@@ -231,9 +227,7 @@ public class ODataExpressionParser {
           orderByDirection = (orderBy.getSortOrder() == SortOrder.asc) ? EMPTY : "DESC"; //$NON-NLS-1$
           orderByMap.put(tableAlias + JPQLStatement.DELIMITER.PERIOD + orderByField, orderByDirection);
         } catch (EdmException e) {
-          throw ODataJPARuntimeException.throwException(
-              ODataJPARuntimeException.GENERAL.addContent(e
-                  .getMessage()), e);
+          throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
         }
       }
     }
@@ -263,15 +257,12 @@ public class ODataExpressionParser {
         propertyName = keyPredicate.getProperty().getMapping().getInternalName();
         edmSimpleType = (EdmSimpleType) keyPredicate.getProperty().getType();
       } catch (EdmException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
 
       literal = evaluateComparingExpression(literal, edmSimpleType);
 
-      if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance()
-          || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
+      if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance() || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
         literal = literal.substring(literal.indexOf('\''), literal.indexOf('}'));
       }
 
@@ -294,13 +285,9 @@ public class ODataExpressionParser {
    */
   private static String evaluateComparingExpression(String value, final EdmSimpleType edmSimpleType) throws ODataJPARuntimeException {
 
-    if (edmSimpleType == EdmSimpleTypeKind.String.getEdmSimpleTypeInstance()
-        || edmSimpleType == EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance())
-    {
+    if (edmSimpleType == EdmSimpleTypeKind.String.getEdmSimpleTypeInstance() || edmSimpleType == EdmSimpleTypeKind.Guid.getEdmSimpleTypeInstance()) {
       value = "\'" + value + "\'"; //$NON-NLS-1$	//$NON-NLS-2$
-    } else if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance()
-        || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance())
-    {
+    } else if (edmSimpleType == EdmSimpleTypeKind.DateTime.getEdmSimpleTypeInstance() || edmSimpleType == EdmSimpleTypeKind.DateTimeOffset.getEdmSimpleTypeInstance()) {
       try {
         Calendar datetime = (Calendar) edmSimpleType.valueOfString(value, EdmLiteralKind.DEFAULT, null, edmSimpleType.getDefaultType());
 
@@ -314,9 +301,7 @@ public class ODataExpressionParser {
         value = JPQLStatement.DELIMITER.LEFT_BRACE + JPQLStatement.KEYWORD.TIMESTAMP + JPQLStatement.DELIMITER.SPACE + "\'" + year + JPQLStatement.DELIMITER.HYPHEN + month + JPQLStatement.DELIMITER.HYPHEN + day + JPQLStatement.DELIMITER.SPACE + hour + JPQLStatement.DELIMITER.COLON + min + JPQLStatement.DELIMITER.COLON + sec + JPQLStatement.KEYWORD.OFFSET + "\'" + JPQLStatement.DELIMITER.RIGHT_BRACE;
 
       } catch (EdmSimpleTypeException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
 
     } else if (edmSimpleType == EdmSimpleTypeKind.Time.getEdmSimpleTypeInstance()) {
@@ -329,9 +314,7 @@ public class ODataExpressionParser {
 
         value = "\'" + hourValue + JPQLStatement.DELIMITER.COLON + minValue + JPQLStatement.DELIMITER.COLON + secValue + "\'";
       } catch (EdmSimpleTypeException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
 
     } else if (edmSimpleType == EdmSimpleTypeKind.Int64.getEdmSimpleTypeInstance()) {
@@ -352,9 +335,7 @@ public class ODataExpressionParser {
           propertyName = edmProperty.getName();
         }
       } catch (EdmException e) {
-        throw ODataJPARuntimeException.throwException(
-            ODataJPARuntimeException.GENERAL.addContent(e
-                .getMessage()), e);
+        throw ODataJPARuntimeException.throwException(ODataJPARuntimeException.GENERAL.addContent(e.getMessage()), e);
       }
       orderByMap.put(tableAlias + JPQLStatement.DELIMITER.PERIOD + propertyName, EMPTY);
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
index f190411..fb76ca4 100644
--- a/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
+++ b/jpa-core/src/main/java/org/apache/olingo/odata2/processor/core/jpa/ODataJPAProcessorDefault.java
@@ -42,157 +42,121 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
   public ODataJPAProcessorDefault(final ODataJPAContext oDataJPAContext) {
     super(oDataJPAContext);
     if (oDataJPAContext == null) {
-      throw new IllegalArgumentException(
-          ODataJPAException.ODATA_JPACTX_NULL);
+      throw new IllegalArgumentException(ODataJPAException.ODATA_JPACTX_NULL);
     }
   }
 
   @Override
-  public ODataResponse readEntitySet(final GetEntitySetUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse readEntitySet(final GetEntitySetUriInfo uriParserResultView, final String contentType) throws ODataException {
 
     List<?> jpaEntities = jpaProcessor.process(uriParserResultView);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(
-        jpaEntities, uriParserResultView, contentType, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntities, uriParserResultView, contentType, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse readEntity(final GetEntityUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse readEntity(final GetEntityUriInfo uriParserResultView, final String contentType) throws ODataException {
 
     Object jpaEntity = jpaProcessor.process(uriParserResultView);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity,
-        uriParserResultView, contentType, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse countEntitySet(final GetEntitySetCountUriInfo uriParserResultView, final String contentType) throws ODataException {
 
     long jpaEntityCount = jpaProcessor.process(uriParserResultView);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(
-        jpaEntityCount, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntityCount, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo,
-      final String contentType) throws ODataException {
+  public ODataResponse existsEntity(final GetEntityCountUriInfo uriInfo, final String contentType) throws ODataException {
 
     long jpaEntityCount = jpaProcessor.process(uriInfo);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(
-        jpaEntityCount, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntityCount, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse createEntity(final PostUriInfo uriParserResultView, final InputStream content,
-      final String requestContentType, final String contentType)
-      throws ODataException {
+  public ODataResponse createEntity(final PostUriInfo uriParserResultView, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
 
-    List<Object> createdJpaEntityList = jpaProcessor.process(uriParserResultView, content,
-        requestContentType);
+    List<Object> createdJpaEntityList = jpaProcessor.process(uriParserResultView, content, requestContentType);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(createdJpaEntityList,
-        uriParserResultView, contentType, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(createdJpaEntityList, uriParserResultView, contentType, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse updateEntity(final PutMergePatchUriInfo uriParserResultView,
-      final InputStream content, final String requestContentType, final boolean merge,
-      final String contentType) throws ODataException {
+  public ODataResponse updateEntity(final PutMergePatchUriInfo uriParserResultView, final InputStream content, final String requestContentType, final boolean merge, final String contentType) throws ODataException {
 
-    Object jpaEntity = jpaProcessor.process(uriParserResultView, content,
-        requestContentType);
+    Object jpaEntity = jpaProcessor.process(uriParserResultView, content, requestContentType);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity,
-        uriParserResultView);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse deleteEntity(final DeleteUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse deleteEntity(final DeleteUriInfo uriParserResultView, final String contentType) throws ODataException {
 
-    Object deletedObj = jpaProcessor.process(uriParserResultView,
-        contentType);
+    Object deletedObj = jpaProcessor.process(uriParserResultView, contentType);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(deletedObj,
-        uriParserResultView);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(deletedObj, uriParserResultView);
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse executeFunctionImport(
-      final GetFunctionImportUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse executeFunctionImport(final GetFunctionImportUriInfo uriParserResultView, final String contentType) throws ODataException {
 
-    List<Object> resultEntity = jpaProcessor
-        .process(uriParserResultView);
+    List<Object> resultEntity = jpaProcessor.process(uriParserResultView);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(
-        resultEntity, uriParserResultView, contentType,
-        oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(resultEntity, uriParserResultView, contentType, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse executeFunctionImportValue(
-      final GetFunctionImportUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse executeFunctionImportValue(final GetFunctionImportUriInfo uriParserResultView, final String contentType) throws ODataException {
 
     List<Object> result = jpaProcessor.process(uriParserResultView);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(result,
-        uriParserResultView, contentType, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(result, uriParserResultView, contentType, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse readEntityLink(
-      final GetEntityLinkUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse readEntityLink(final GetEntityLinkUriInfo uriParserResultView, final String contentType) throws ODataException {
 
     Object jpaEntity = jpaProcessor.process(uriParserResultView);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity,
-        uriParserResultView, contentType, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse readEntityLinks(
-      final GetEntitySetLinksUriInfo uriParserResultView,
-      final String contentType) throws ODataException {
+  public ODataResponse readEntityLinks(final GetEntitySetLinksUriInfo uriParserResultView, final String contentType) throws ODataException {
 
     List<Object> jpaEntity = jpaProcessor.process(uriParserResultView);
 
-    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity,
-        uriParserResultView, contentType, oDataJPAContext);
+    ODataResponse oDataResponse = ODataJPAResponseBuilder.build(jpaEntity, uriParserResultView, contentType, oDataJPAContext);
 
     return oDataResponse;
   }
 
   @Override
-  public ODataResponse createEntityLink(
-      final PostUriInfo uriParserResultView, final InputStream content,
-      final String requestContentType, final String contentType) throws ODataException {
+  public ODataResponse createEntityLink(final PostUriInfo uriParserResultView, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
 
     jpaProcessor.process(uriParserResultView, content, requestContentType, contentType);
 
@@ -200,9 +164,7 @@ public class ODataJPAProcessorDefault extends ODataJPAProcessor {
   }
 
   @Override
-  public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriParserResultView,
-      final InputStream content, final String requestContentType, final String contentType)
-      throws ODataException {
+  public ODataResponse updateEntityLink(final PutMergePatchUriInfo uriParserResultView, final InputStream content, final String requestContentType, final String contentType) throws ODataException {
 
     jpaProcessor.process(uriParserResultView, content, requestContentType, contentType);
 


[13/22] eliminate checkstyle warnings

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
index b5a341a..2bad041 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmReferentialConstraintTest.java
@@ -30,10 +30,6 @@ import javax.persistence.JoinColumn;
 import javax.persistence.metamodel.Attribute;
 import javax.persistence.metamodel.ManagedType;
 
-import org.easymock.EasyMock;
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.api.edm.FullQualifiedName;
 import org.apache.olingo.odata2.api.edm.provider.Association;
 import org.apache.olingo.odata2.api.edm.provider.AssociationEnd;
@@ -44,6 +40,9 @@ import org.apache.olingo.odata2.processor.core.jpa.common.ODataJPATestConstants;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAAttributeMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAJavaMemberMock;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAManagedTypeMock;
+import org.easymock.EasyMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
 
@@ -53,10 +52,7 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
   @Before
   public void setUp() {
     objJPAEdmReferentialConstraintTest = new JPAEdmReferentialConstraintTest();
-    objJPAEdmReferentialConstraint = new JPAEdmReferentialConstraint(
-        objJPAEdmReferentialConstraintTest,
-        objJPAEdmReferentialConstraintTest,
-        objJPAEdmReferentialConstraintTest);
+    objJPAEdmReferentialConstraint = new JPAEdmReferentialConstraint(objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest);
     try {
       objJPAEdmReferentialConstraint.getBuilder().build();
     } catch (ODataJPAModelException e) {
@@ -81,17 +77,13 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
 
   @Test
   public void testGetEdmReferentialConstraint() {
-    assertNotNull(objJPAEdmReferentialConstraint
-        .getEdmReferentialConstraint());
+    assertNotNull(objJPAEdmReferentialConstraint.getEdmReferentialConstraint());
   }
 
   @Test
   public void testIsExistsTrue() {
     objJPAEdmReferentialConstraintTest = new JPAEdmReferentialConstraintTest();
-    objJPAEdmReferentialConstraint = new JPAEdmReferentialConstraint(
-        objJPAEdmReferentialConstraintTest,
-        objJPAEdmReferentialConstraintTest,
-        objJPAEdmReferentialConstraintTest);
+    objJPAEdmReferentialConstraint = new JPAEdmReferentialConstraint(objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest, objJPAEdmReferentialConstraintTest);
     try {
       objJPAEdmReferentialConstraint.getBuilder().build();
       objJPAEdmReferentialConstraint.getBuilder().build();
@@ -105,21 +97,15 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
 
   @Test
   public void testGetRelationShipName() {
-    assertEquals("Assoc_SalesOrderHeader_SalesOrderItem",
-        objJPAEdmReferentialConstraint.getEdmRelationShipName());
+    assertEquals("Assoc_SalesOrderHeader_SalesOrderItem", objJPAEdmReferentialConstraint.getEdmRelationShipName());
   }
 
   @Override
   public Association getEdmAssociation() {
     Association association = new Association();
     association.setName("Assoc_SalesOrderHeader_SalesOrderItem");
-    association.setEnd1(new AssociationEnd().setType(
-        new FullQualifiedName("salesorderprocessing", "String"))
-        .setRole("SalesOrderHeader"));
-    association.setEnd2(new AssociationEnd()
-        .setType(
-            new FullQualifiedName("salesorderprocessing",
-                "SalesOrderItem")).setRole("SalesOrderItem"));
+    association.setEnd1(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "String")).setRole("SalesOrderHeader"));
+    association.setEnd2(new AssociationEnd().setType(new FullQualifiedName("salesorderprocessing", "SalesOrderItem")).setRole("SalesOrderItem"));
     return association;
   }
 
@@ -134,8 +120,7 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
   }
 
   @SuppressWarnings("hiding")
-  private class AttributeMock<Object, String> extends
-      JPAAttributeMock<Object, String> {
+  private class AttributeMock<Object, String> extends JPAAttributeMock<Object, String> {
 
     @Override
     public Member getJavaMember() {
@@ -175,8 +160,7 @@ public class JPAEdmReferentialConstraintTest extends JPAEdmTestModelView {
     @Override
     public <T extends Annotation> T getAnnotation(final Class<T> annotationClass) {
       JoinColumn joinColumn = EasyMock.createMock(JoinColumn.class);
-      EasyMock.expect(joinColumn.referencedColumnName())
-          .andReturn("SOID");
+      EasyMock.expect(joinColumn.referencedColumnName()).andReturn("SOID");
       EasyMock.expect(joinColumn.name()).andReturn("SOID");
 
       EasyMock.replay(joinColumn);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
index d3936b0..5fec2e7 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmSchemaTest.java
@@ -26,11 +26,10 @@ import static org.junit.Assert.assertTrue;
 
 import javax.persistence.metamodel.Metamodel;
 
-import org.junit.Before;
-import org.junit.Test;
-
 import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder;
 import org.apache.olingo.odata2.processor.core.jpa.mock.model.JPAMetaModelMock;
+import org.junit.Before;
+import org.junit.Test;
 
 public class JPAEdmSchemaTest extends JPAEdmTestModelView {
   private JPAEdmSchemaTest objJPAEdmSchemaTest;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
----------------------------------------------------------------------
diff --git a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
index 18f77b2..e5c8d39 100644
--- a/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
+++ b/jpa-core/src/test/java/org/apache/olingo/odata2/processor/core/jpa/model/JPAEdmTestModelView.java
@@ -59,12 +59,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView;
 import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView;
 
-public class JPAEdmTestModelView implements JPAEdmAssociationEndView,
-    JPAEdmAssociationSetView, JPAEdmAssociationView, JPAEdmBaseView,
-    JPAEdmComplexPropertyView, JPAEdmComplexTypeView,
-    JPAEdmEntityContainerView, JPAEdmEntitySetView, JPAEdmEntityTypeView,
-    JPAEdmKeyView, JPAEdmModelView, JPAEdmNavigationPropertyView,
-    JPAEdmPropertyView, JPAEdmReferentialConstraintView, JPAEdmSchemaView {
+public class JPAEdmTestModelView implements JPAEdmAssociationEndView, JPAEdmAssociationSetView, JPAEdmAssociationView, JPAEdmBaseView, JPAEdmComplexPropertyView, JPAEdmComplexTypeView, JPAEdmEntityContainerView, JPAEdmEntitySetView, JPAEdmEntityTypeView, JPAEdmKeyView, JPAEdmModelView, JPAEdmNavigationPropertyView, JPAEdmPropertyView, JPAEdmReferentialConstraintView, JPAEdmSchemaView {
 
   protected JPAEdmMappingModelAccess mappingModelAccess;
 
@@ -304,8 +299,7 @@ public class JPAEdmTestModelView implements JPAEdmAssociationEndView,
   }
 
   @Override
-  public void addJPAEdmNavigationPropertyView(
-      final JPAEdmNavigationPropertyView view) {
+  public void addJPAEdmNavigationPropertyView(final JPAEdmNavigationPropertyView view) {
 
   }
 
@@ -320,8 +314,7 @@ public class JPAEdmTestModelView implements JPAEdmAssociationEndView,
   }
 
   @Override
-  public void expandEdmComplexType(final ComplexType complexType,
-      final List<Property> expandedPropertyList, final String embeddablePropertyName) {
+  public void expandEdmComplexType(final ComplexType complexType, final List<Property> expandedPropertyList, final String embeddablePropertyName) {
 
   }
 
@@ -354,15 +347,13 @@ public class JPAEdmTestModelView implements JPAEdmAssociationEndView,
   }
 
   @Override
-  public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView,
-      final JPAEdmAssociationEndView associationEndView) {
+  public void addJPAEdmAssociationView(final JPAEdmAssociationView associationView, final JPAEdmAssociationEndView associationEndView) {
     // TODO Auto-generated method stub
 
   }
 
   @Override
-  public int getNumberOfAssociationsWithSimilarEndPoints(
-      final JPAEdmAssociationEndView view) {
+  public int getNumberOfAssociationsWithSimilarEndPoints(final JPAEdmAssociationEndView view) {
     // TODO Auto-generated method stub
     return 0;
   }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
index 63ced0f..56b0fab 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ODataRequestHandler.java
@@ -103,8 +103,7 @@ public class ODataRequestHandler {
       final UriType uriType = uriInfo.getUriType();
       validateMethodAndUri(method, uriInfo);
 
-      if (method == ODataHttpMethod.POST || method == ODataHttpMethod.PUT
-          || method == ODataHttpMethod.PATCH || method == ODataHttpMethod.MERGE) {
+      if (method == ODataHttpMethod.POST || method == ODataHttpMethod.PUT || method == ODataHttpMethod.PATCH || method == ODataHttpMethod.MERGE) {
         checkRequestContentType(uriInfo, request.getContentType());
       }
 
@@ -126,14 +125,12 @@ public class ODataRequestHandler {
 
     } catch (final Exception e) {
       exception = e;
-      odataResponse = new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders())
-          .wrapInExceptionResponse(e);
+      odataResponse = new ODataExceptionWrapper(context, request.getQueryParameters(), request.getAcceptHeaders()).wrapInExceptionResponse(e);
     }
     context.stopRuntimeMeasurement(timingHandle);
 
     final String debugValue = getDebugValue(context, request.getQueryParameters());
-    return debugValue == null ?
-        odataResponse : new ODataDebugResponseWrapper(context, odataResponse, uriInfo, exception, debugValue).wrapResponse();
+    return debugValue == null ? odataResponse : new ODataDebugResponseWrapper(context, odataResponse, uriInfo, exception, debugValue).wrapResponse();
   }
 
   private String getServerDataServiceVersion() throws ODataException {
@@ -187,28 +184,20 @@ public class ODataRequestHandler {
     case URI2:
     case URI6A:
     case URI7A:
-      if (method != ODataHttpMethod.GET
-          && method != ODataHttpMethod.PUT
-          && method != ODataHttpMethod.DELETE
-          && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+      if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
       }
       break;
 
     case URI3:
-      if (method != ODataHttpMethod.GET
-          && method != ODataHttpMethod.PUT
-          && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+      if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
       }
       break;
 
     case URI4:
     case URI5:
-      if (method != ODataHttpMethod.GET
-          && method != ODataHttpMethod.PUT
-          && method != ODataHttpMethod.DELETE
-          && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
+      if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE && method != ODataHttpMethod.PATCH && method != ODataHttpMethod.MERGE) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
       } else if (method == ODataHttpMethod.DELETE && !uriInfo.isValue()) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
@@ -229,9 +218,7 @@ public class ODataRequestHandler {
       break;
 
     case URI17:
-      if (method != ODataHttpMethod.GET
-          && method != ODataHttpMethod.PUT
-          && method != ODataHttpMethod.DELETE) {
+      if (method != ODataHttpMethod.GET && method != ODataHttpMethod.PUT && method != ODataHttpMethod.DELETE) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
       }
       break;
@@ -242,9 +229,7 @@ public class ODataRequestHandler {
   }
 
   private static void checkFunctionImport(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
-    if (uriInfo.getFunctionImport() != null
-        && uriInfo.getFunctionImport().getHttpMethod() != null
-        && !uriInfo.getFunctionImport().getHttpMethod().equals(method.toString())) {
+    if (uriInfo.getFunctionImport() != null && uriInfo.getFunctionImport().getHttpMethod() != null && !uriInfo.getFunctionImport().getHttpMethod().equals(method.toString())) {
       throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
     }
   }
@@ -253,23 +238,13 @@ public class ODataRequestHandler {
     switch (uriInfo.getUriType()) {
     case URI1:
     case URI6B:
-      if (uriInfo.getFormat() != null
-          || uriInfo.getFilter() != null
-          || uriInfo.getInlineCount() != null
-          || uriInfo.getOrderBy() != null
-          || uriInfo.getSkipToken() != null
-          || uriInfo.getSkip() != null
-          || uriInfo.getTop() != null
-          || !uriInfo.getExpand().isEmpty()
-          || !uriInfo.getSelect().isEmpty()) {
+      if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null || uriInfo.getTop() != null || !uriInfo.getExpand().isEmpty() || !uriInfo.getSelect().isEmpty()) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
       }
       break;
 
     case URI2:
-      if (uriInfo.getFormat() != null
-          || !uriInfo.getExpand().isEmpty()
-          || !uriInfo.getSelect().isEmpty()) {
+      if (uriInfo.getFormat() != null || !uriInfo.getExpand().isEmpty() || !uriInfo.getSelect().isEmpty()) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
       }
       if (method == ODataHttpMethod.DELETE) {
@@ -301,13 +276,7 @@ public class ODataRequestHandler {
       break;
 
     case URI7B:
-      if (uriInfo.getFormat() != null
-          || uriInfo.getFilter() != null
-          || uriInfo.getInlineCount() != null
-          || uriInfo.getOrderBy() != null
-          || uriInfo.getSkipToken() != null
-          || uriInfo.getSkip() != null
-          || uriInfo.getTop() != null) {
+      if (uriInfo.getFormat() != null || uriInfo.getFilter() != null || uriInfo.getInlineCount() != null || uriInfo.getOrderBy() != null || uriInfo.getSkipToken() != null || uriInfo.getSkip() != null || uriInfo.getTop() != null) {
         throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
       }
       break;
@@ -349,9 +318,7 @@ public class ODataRequestHandler {
   }
 
   private static void checkProperty(final ODataHttpMethod method, final UriInfoImpl uriInfo) throws ODataException {
-    if ((uriInfo.getUriType() == UriType.URI4 || uriInfo.getUriType() == UriType.URI5)
-        && (isPropertyKey(uriInfo)
-        || method == ODataHttpMethod.DELETE && !isPropertyNullable(getProperty(uriInfo)))) {
+    if ((uriInfo.getUriType() == UriType.URI4 || uriInfo.getUriType() == UriType.URI5) && (isPropertyKey(uriInfo) || method == ODataHttpMethod.DELETE && !isPropertyNullable(getProperty(uriInfo)))) {
       throw new ODataMethodNotAllowedException(ODataMethodNotAllowedException.DISPATCH);
     }
   }
@@ -384,18 +351,15 @@ public class ODataRequestHandler {
 
     // Don't check the request content type for function imports
     // because the request body is not used at all.
-    if (processorFeature == FunctionImportProcessor.class
-        || processorFeature == FunctionImportValueProcessor.class) {
+    if (processorFeature == FunctionImportProcessor.class || processorFeature == FunctionImportValueProcessor.class) {
       return;
     }
 
     // Adjust processor feature.
     if (processorFeature == EntitySetProcessor.class) {
-      processorFeature = uriInfo.getTargetEntitySet().getEntityType().hasStream() ?
-          EntityMediaProcessor.class : // A media resource can have any type.
+      processorFeature = uriInfo.getTargetEntitySet().getEntityType().hasStream() ? EntityMediaProcessor.class : // A media resource can have any type.
           EntityProcessor.class; // The request must contain a single entity!
-    } else if (processorFeature == EntityLinksProcessor.class)
-    {
+    } else if (processorFeature == EntityLinksProcessor.class) {
       processorFeature = EntityLinkProcessor.class; // The request must contain a single link!
     }
 
@@ -405,10 +369,7 @@ public class ODataRequestHandler {
     }
 
     // Get list of supported content types based on processor feature.
-    final List<ContentType> supportedContentTypes =
-        processorFeature == EntitySimplePropertyValueProcessor.class ?
-            getSupportedContentTypes(getProperty(uriInfo)) :
-            getSupportedContentTypes(processorFeature);
+    final List<ContentType> supportedContentTypes = processorFeature == EntitySimplePropertyValueProcessor.class ? getSupportedContentTypes(getProperty(uriInfo)) : getSupportedContentTypes(processorFeature);
 
     if (!hasMatchingContentType(parsedContentType, supportedContentTypes)) {
       throw new ODataUnsupportedMediaTypeException(ODataUnsupportedMediaTypeException.NOT_SUPPORTED.addContent(parsedContentType));
@@ -431,9 +392,7 @@ public class ODataRequestHandler {
   }
 
   private static List<ContentType> getSupportedContentTypes(final EdmProperty property) throws EdmException {
-    return property.getType() == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance() ?
-        Arrays.asList(property.getMimeType() == null ? ContentType.WILDCARD : ContentType.create(property.getMimeType())) :
-        Arrays.asList(ContentType.TEXT_PLAIN, ContentType.TEXT_PLAIN_CS_UTF_8);
+    return property.getType() == EdmSimpleTypeKind.Binary.getEdmSimpleTypeInstance() ? Arrays.asList(property.getMimeType() == null ? ContentType.WILDCARD : ContentType.create(property.getMimeType())) : Arrays.asList(ContentType.TEXT_PLAIN, ContentType.TEXT_PLAIN_CS_UTF_8);
   }
 
   private List<String> getSupportedContentTypes(final UriInfoImpl uriInfo) throws ODataException {
@@ -450,7 +409,6 @@ public class ODataRequestHandler {
 
   private static String getQueryDebugValue(final Map<String, String> queryParameters) {
     final String debugValue = queryParameters.get(ODataDebugResponseWrapper.ODATA_DEBUG_QUERY_PARAMETER);
-    return ODataDebugResponseWrapper.ODATA_DEBUG_JSON.equals(debugValue) ?
-        debugValue : null;
+    return ODataDebugResponseWrapper.ODATA_DEBUG_JSON.equals(debugValue) ? debugValue : null;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
index 0b4e6bd..4c0ae32 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/batch/BatchRequestParser.java
@@ -209,71 +209,56 @@ public class BatchRequestParser {
 
   private ODataRequest parseRequest(final Scanner scanner, final boolean isChangeSet) throws BatchException {
     try {
-    ODataRequest request;
-    if (scanner.hasNext(REG_EX_REQUEST_LINE)) {
-      scanner.next(REG_EX_REQUEST_LINE);
-      currentLineNumber++;
-      String method = null;
-      String uri = null;
-      MatchResult result = scanner.match();
-      if (result.groupCount() == 2) {
-        method = result.group(1);
-        uri = result.group(2).trim();
-      } else {
+      ODataRequest request;
+      if (scanner.hasNext(REG_EX_REQUEST_LINE)) {
+        scanner.next(REG_EX_REQUEST_LINE);
         currentLineNumber++;
-        throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(currentLineNumber));
-      }
-      PathInfo pathInfo = parseRequestUri(uri);
-      Map<String, String> queryParameters = parseQueryParameters(uri);
-      if (isChangeSet) {
-        if (!HTTP_CHANGESET_METHODS.contains(method)) {
-          throw new BatchException(BatchException.INVALID_CHANGESET_METHOD.addContent(currentLineNumber));
+        String method = null;
+        String uri = null;
+        MatchResult result = scanner.match();
+        if (result.groupCount() == 2) {
+          method = result.group(1);
+          uri = result.group(2).trim();
+        } else {
+          currentLineNumber++;
+          throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(currentLineNumber));
+        }
+        PathInfo pathInfo = parseRequestUri(uri);
+        Map<String, String> queryParameters = parseQueryParameters(uri);
+        if (isChangeSet) {
+          if (!HTTP_CHANGESET_METHODS.contains(method)) {
+            throw new BatchException(BatchException.INVALID_CHANGESET_METHOD.addContent(currentLineNumber));
+          }
+        } else if (!HTTP_BATCH_METHODS.contains(method)) {
+          throw new BatchException(BatchException.INVALID_QUERY_OPERATION_METHOD.addContent(currentLineNumber));
+        }
+        ODataHttpMethod httpMethod = ODataHttpMethod.valueOf(method);
+        Map<String, List<String>> headers = parseRequestHeaders(scanner);
+        if (currentMimeHeaderContentId != null) {
+          List<String> headerList = new ArrayList<String>();
+          headerList.add(currentMimeHeaderContentId);
+          headers.put(BatchConstants.MIME_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH), headerList);
         }
-      } else if (!HTTP_BATCH_METHODS.contains(method)) {
-        throw new BatchException(BatchException.INVALID_QUERY_OPERATION_METHOD.addContent(currentLineNumber));
-      }
-      ODataHttpMethod httpMethod = ODataHttpMethod.valueOf(method);
-      Map<String, List<String>> headers = parseRequestHeaders(scanner);
-      if (currentMimeHeaderContentId != null) {
-        List<String> headerList = new ArrayList<String>();
-        headerList.add(currentMimeHeaderContentId);
-        headers.put(BatchConstants.MIME_HEADER_CONTENT_ID.toLowerCase(Locale.ENGLISH), headerList);
-      }
 
-      String contentType = getContentTypeHeader(headers);
-      List<String> acceptHeaders = getAcceptHeader(headers);
-      List<Locale> acceptLanguages = getAcceptLanguageHeader(headers);
-      parseNewLine(scanner);
-      InputStream body;
+        String contentType = getContentTypeHeader(headers);
+        List<String> acceptHeaders = getAcceptHeader(headers);
+        List<Locale> acceptLanguages = getAcceptLanguageHeader(headers);
+        parseNewLine(scanner);
+        InputStream body;
         body = new ByteArrayInputStream("".getBytes("UTF-8"));
-      if (isChangeSet) {
-        body = parseBody(scanner);
-      }
-      if (contentType != null) {
-        request = ODataRequest.method(httpMethod)
-            .queryParameters(queryParameters)
-            .requestHeaders(headers)
-            .pathInfo(pathInfo)
-            .acceptableLanguages(acceptLanguages)
-            .contentType(contentType)
-            .body(body)
-            .acceptHeaders(acceptHeaders)
-            .build();
+        if (isChangeSet) {
+          body = parseBody(scanner);
+        }
+        if (contentType != null) {
+          request = ODataRequest.method(httpMethod).queryParameters(queryParameters).requestHeaders(headers).pathInfo(pathInfo).acceptableLanguages(acceptLanguages).contentType(contentType).body(body).acceptHeaders(acceptHeaders).build();
+        } else {
+          request = ODataRequest.method(httpMethod).queryParameters(queryParameters).requestHeaders(headers).pathInfo(pathInfo).acceptableLanguages(acceptLanguages).body(body).acceptHeaders(acceptHeaders).build();
+        }
       } else {
-        request = ODataRequest.method(httpMethod)
-            .queryParameters(queryParameters)
-            .requestHeaders(headers)
-            .pathInfo(pathInfo)
-            .acceptableLanguages(acceptLanguages)
-            .body(body)
-            .acceptHeaders(acceptHeaders)
-            .build();
+        currentLineNumber++;
+        throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(currentLineNumber));
       }
-    } else {
-      currentLineNumber++;
-      throw new BatchException(BatchException.INVALID_REQUEST_LINE.addContent(scanner.next()).addContent(currentLineNumber));
-    }
-    return request;
+      return request;
     } catch (UnsupportedEncodingException e) {
       throw new ODataRuntimeException(e);
     }
@@ -295,8 +280,7 @@ public class BatchRequestParser {
           } else if (HttpHeaders.ACCEPT_LANGUAGE.equalsIgnoreCase(headerName)) {
             List<String> acceptLanguageHeaders = parseAcceptableLanguages(headerValue);
             headers.put(headerName, acceptLanguageHeaders);
-          }
-          else if (!BatchConstants.HTTP_CONTENT_ID.equalsIgnoreCase(headerName)) {
+          } else if (!BatchConstants.HTTP_CONTENT_ID.equalsIgnoreCase(headerName)) {
             if (headers.containsKey(headerName)) {
               headers.get(headerName).add(headerValue);
             } else {
@@ -405,26 +389,26 @@ public class BatchRequestParser {
 
   private InputStream parseBody(final Scanner scanner) {
     try {
-    String body = null;
-    InputStream requestBody;
-    while (scanner.hasNext() && !scanner.hasNext(REG_EX_ANY_BOUNDARY_STRING)) {
-      if (!scanner.hasNext(REG_EX_ZERO_OR_MORE_WHITESPACES)) {
-        if (body == null) {
-          body = scanner.next();
+      String body = null;
+      InputStream requestBody;
+      while (scanner.hasNext() && !scanner.hasNext(REG_EX_ANY_BOUNDARY_STRING)) {
+        if (!scanner.hasNext(REG_EX_ZERO_OR_MORE_WHITESPACES)) {
+          if (body == null) {
+            body = scanner.next();
+          } else {
+            body = body + LF + scanner.next();
+          }
         } else {
-          body = body + LF + scanner.next();
+          scanner.next();
         }
-      } else {
-        scanner.next();
+        currentLineNumber++;
       }
-      currentLineNumber++;
-    }
-    if (body != null) {
+      if (body != null) {
         requestBody = new ByteArrayInputStream(body.getBytes("UTF-8"));
-    } else {
-      requestBody = new ByteArrayInputStream("".getBytes("UTF-8"));
-    }
-    return requestBody;
+      } else {
+        requestBody = new ByteArrayInputStream("".getBytes("UTF-8"));
+      }
+      return requestBody;
     } catch (UnsupportedEncodingException e) {
       throw new ODataRuntimeException(e);
     }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
index 5cd6bf2..22f6cfd 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/commons/Encoder.java
@@ -53,40 +53,8 @@ public class Encoder {
   private final static String GEN_DELIMS = ":/?#[]@";
   // RFC 3986 says: "For consistency, URI producers and normalizers should
   // use uppercase hexadecimal digits for all percent-encodings."
-  private final static String[] hex = {
-      "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
-      "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F",
-      "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
-      "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F",
-      "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27",
-      "%28", "%29", "%2A", "%2B", "%2C", "%2D", "%2E", "%2F",
-      "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37",
-      "%38", "%39", "%3A", "%3B", "%3C", "%3D", "%3E", "%3F",
-      "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47",
-      "%48", "%49", "%4A", "%4B", "%4C", "%4D", "%4E", "%4F",
-      "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57",
-      "%58", "%59", "%5A", "%5B", "%5C", "%5D", "%5E", "%5F",
-      "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
-      "%68", "%69", "%6A", "%6B", "%6C", "%6D", "%6E", "%6F",
-      "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77",
-      "%78", "%79", "%7A", "%7B", "%7C", "%7D", "%7E", "%7F",
-      "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
-      "%88", "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F",
-      "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",
-      "%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F",
-      "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7",
-      "%A8", "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF",
-      "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7",
-      "%B8", "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF",
-      "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7",
-      "%C8", "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF",
-      "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7",
-      "%D8", "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF",
-      "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7",
-      "%E8", "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF",
-      "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7",
-      "%F8", "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF"
-  };
+  private final static String[] hex = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0A", "%0B", "%0C", "%0D", "%0E", "%0F", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1A", "%1B", "%1C", "%1D", "%1E", "%1F", "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27", "%28", "%29", "%2A", "%2B", "%2C", "%2D", "%2E", "%2F", "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37", "%38", "%39", "%3A", "%3B", "%3C", "%3D", "%3E", "%3F", "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47", "%48", "%49", "%4A", "%4B", "%4C", "%4D", "%4E", "%4F", "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57", "%58", "%59", "%5A", "%5B", "%5C", "%5D", "%5E", "%5F", "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67", "%68", "%69", "%6A", "%6B", "%6C", "%6D", "%6E", "%6F", "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77", "%78", "%79", "%7A", "%7B", "%7C", "%7D", "%7E", "%7F", "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87", "%88"
 ,
+      "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F", "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97", "%98", "%99", "%9A", "%9B", "%9C", "%9D", "%9E", "%9F", "%A0", "%A1", "%A2", "%A3", "%A4", "%A5", "%A6", "%A7", "%A8", "%A9", "%AA", "%AB", "%AC", "%AD", "%AE", "%AF", "%B0", "%B1", "%B2", "%B3", "%B4", "%B5", "%B6", "%B7", "%B8", "%B9", "%BA", "%BB", "%BC", "%BD", "%BE", "%BF", "%C0", "%C1", "%C2", "%C3", "%C4", "%C5", "%C6", "%C7", "%C8", "%C9", "%CA", "%CB", "%CC", "%CD", "%CE", "%CF", "%D0", "%D1", "%D2", "%D3", "%D4", "%D5", "%D6", "%D7", "%D8", "%D9", "%DA", "%DB", "%DC", "%DD", "%DE", "%DF", "%E0", "%E1", "%E2", "%E3", "%E4", "%E5", "%E6", "%E7", "%E8", "%E9", "%EA", "%EB", "%EC", "%ED", "%EE", "%EF", "%F0", "%F1", "%F2", "%F3", "%F4", "%F5", "%F6", "%F7", "%F8", "%F9", "%FA", "%FB", "%FC", "%FD", "%FE", "%FF" };
 
   private static final Encoder encoder = new Encoder(ODATA_UNENCODED);
 
@@ -124,8 +92,7 @@ public class Encoder {
           resultStr.append(character);
         } else if (utf8Byte >= 0) {
           resultStr.append(hex[utf8Byte]);
-        }
-        else {
+        } else {
           // case UTF-8 continuation byte
           resultStr.append(hex[256 + utf8Byte]); // index adjusted for the usage of signed bytes
         }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
index c622437..89bfe94 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
@@ -245,8 +245,7 @@ public class FilterParserImpl implements FilterParser {
       if ((expression == null) && (expectAnotherExpression == true)) {
         //Tested with TestParserExceptions.TestPMreadParameters CASE 4 e.g. "$filter=concat(,"
         throw FilterParserExceptionImpl.createEXPRESSION_EXPECTED_AFTER_POS(token, curExpression);
-      } else if (expression != null) //parameter list may be empty
-      {
+      } else if (expression != null) {//parameter list may be empty
         methodExpression.appendParameter(expression);
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/1e5280b7/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
index a19ccd2..4289bc5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
@@ -59,13 +59,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", binaryExpression.getKind().toString()).separator()
-          .namedStringValue("operator", operator.toUriLiteral()).separator()
-          .namedStringValueRaw("type", getType(binaryExpression)).separator()
-          .name("left").unquotedValue(leftSide.toString()).separator()
-          .name("right").unquotedValue(rightSide.toString())
-          .endObject();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", binaryExpression.getKind().toString()).separator().namedStringValue("operator", operator.toUriLiteral()).separator().namedStringValueRaw("type", getType(binaryExpression)).separator().name("left").unquotedValue(leftSide.toString()).separator().name("right").unquotedValue(rightSide.toString()).endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {
@@ -78,10 +72,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", "order collection").separator()
-          .name("orders")
-          .beginArray();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", "order collection").separator().name("orders").beginArray();
       boolean first = true;
       for (final Object order : orders) {
         if (first) {
@@ -91,8 +82,7 @@ public class JsonVisitor implements ExpressionVisitor {
         }
         jsonStreamWriter.unquotedValue(order.toString());
       }
-      jsonStreamWriter.endArray()
-          .endObject();
+      jsonStreamWriter.endArray().endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {
@@ -105,11 +95,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", orderExpression.getKind().toString()).separator()
-          .namedStringValueRaw("sortorder", sortOrder.toString()).separator()
-          .name("expression").unquotedValue(filterResult.toString())
-          .endObject();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", orderExpression.getKind().toString()).separator().namedStringValueRaw("sortorder", sortOrder.toString()).separator().name("expression").unquotedValue(filterResult.toString()).endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {
@@ -122,11 +108,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", literal.getKind().toString()).separator()
-          .namedStringValueRaw("type", getType(literal)).separator()
-          .namedStringValue("value", edmLiteral.getLiteral())
-          .endObject();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", literal.getKind().toString()).separator().namedStringValueRaw("type", getType(literal)).separator().namedStringValue("value", edmLiteral.getLiteral()).endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {
@@ -139,12 +121,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", methodExpression.getKind().toString()).separator()
-          .namedStringValueRaw("operator", method.toUriLiteral()).separator()
-          .namedStringValueRaw("type", getType(methodExpression)).separator()
-          .name("parameters")
-          .beginArray();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", methodExpression.getKind().toString()).separator().namedStringValueRaw("operator", method.toUriLiteral()).separator().namedStringValueRaw("type", getType(methodExpression)).separator().name("parameters").beginArray();
       boolean first = true;
       for (Object parameter : parameters) {
         if (first) {
@@ -154,8 +131,7 @@ public class JsonVisitor implements ExpressionVisitor {
         }
         jsonStreamWriter.unquotedValue(parameter.toString());
       }
-      jsonStreamWriter.endArray()
-          .endObject();
+      jsonStreamWriter.endArray().endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {
@@ -168,12 +144,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", memberExpression.getKind().toString()).separator()
-          .namedStringValueRaw("type", getType(memberExpression)).separator()
-          .name("source").unquotedValue(path.toString()).separator()
-          .name("path").unquotedValue(property.toString())
-          .endObject();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", memberExpression.getKind().toString()).separator().namedStringValueRaw("type", getType(memberExpression)).separator().name("source").unquotedValue(path.toString()).separator().name("path").unquotedValue(property.toString()).endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {
@@ -186,11 +157,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", propertyExpression.getKind().toString()).separator()
-          .namedStringValue("name", uriLiteral).separator()
-          .namedStringValueRaw("type", getType(propertyExpression))
-          .endObject();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", propertyExpression.getKind().toString()).separator().namedStringValue("name", uriLiteral).separator().namedStringValueRaw("type", getType(propertyExpression)).endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {
@@ -203,12 +170,7 @@ public class JsonVisitor implements ExpressionVisitor {
     try {
       StringWriter writer = new StringWriter();
       JsonStreamWriter jsonStreamWriter = new JsonStreamWriter(writer);
-      jsonStreamWriter.beginObject()
-          .namedStringValueRaw("nodeType", unaryExpression.getKind().toString()).separator()
-          .namedStringValueRaw("operator", operator.toUriLiteral()).separator()
-          .namedStringValueRaw("type", getType(unaryExpression)).separator()
-          .name("operand").unquotedValue(operand.toString())
-          .endObject();
+      jsonStreamWriter.beginObject().namedStringValueRaw("nodeType", unaryExpression.getKind().toString()).separator().namedStringValueRaw("operator", operator.toUriLiteral()).separator().namedStringValueRaw("type", getType(unaryExpression)).separator().name("operand").unquotedValue(operand.toString()).endObject();
       writer.flush();
       return writer.toString();
     } catch (final IOException e) {


[05/22] remove @author - javadoc warning

Posted by sk...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
index f3eb88b..1474909 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/TombstoneProducer.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.core.ep.aggregator.EntityPropertyInfo;
 import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
- * @author
+ *  
  */
 public class TombstoneProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
index 97e5b8e..4c9d696 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlCollectionEntityProducer.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
  * Provider for writing a collection of simple-type or complex-type instances
- * @author
+ *  
  */
 public class XmlCollectionEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
index f3d450b..320c45c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinkEntityProducer.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
  * Provider for writing a single link.
- * @author
+ *  
  */
 public class XmlLinkEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
index 8e5155e..8dd7ab8 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlLinksEntityProducer.java
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
  * Provider for writing a collection of links
- * @author
+ *  
  */
 public class XmlLinksEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
index 519b895..4f2444d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/producer/XmlPropertyEntityProducer.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.core.ep.util.FormatXml;
 
 /**
  * Internal EntityProvider for simple and complex EDM properties which are pre-analyzed as {@link EntityPropertyInfo}.
- * @author
+ *  
  */
 public class XmlPropertyEntityProducer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
index 53d89ba..fe29250 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/CircleStreamBuffer.java
@@ -29,7 +29,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  * Circular stream buffer to write/read into/from one single buffer.
  * With support of {@link InputStream} and {@link OutputStream} access to buffered data.
  * 
- * @author
+ *  
  */
 public class CircleStreamBuffer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
index 852d4aa..05b1a29 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatJson.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.core.ep.util;
 
 /**
  * String constants for formatting and parsing of JSON.
- * @author
+ *  
  */
 public class FormatJson {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
index 1bd9619..f43809e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/FormatXml.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.core.ep.util;
 
 /**
  * String constants for formatting and parsing of XML.
- * @author
+ *  
  */
 public class FormatXml {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
index 46b9fce..5822217 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/ep/util/JsonStreamWriter.java
@@ -23,7 +23,7 @@ import java.io.Writer;
 
 /**
  * Writes JSON output.
- * @author
+ *  
  */
 public class JsonStreamWriter {
   private final Writer writer;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
index 5528ddd..6f8a310 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/MessageService.java
@@ -33,7 +33,7 @@ import java.util.ResourceBundle;
 import org.apache.olingo.odata2.api.exception.MessageReference;
 
 /**
- * @author
+ *  
  */
 public class MessageService {
   private static final String BUNDLE_NAME = "i18n";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
index 369653f..42a7026 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/exception/ODataRuntimeException.java
@@ -22,7 +22,7 @@ package org.apache.olingo.odata2.core.exception;
  * Common un-checked exception for the <code>OData</code> library and
  * base exception for all <code>OData</code>-related exceptions
  * caused by programming errors and/or unexpected behavior within the code.
- * @author
+ *  
  */
 public final class ODataRuntimeException extends RuntimeException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
index 3b7df6f..19eb01e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/processor/ODataSingleProcessorService.java
@@ -52,7 +52,7 @@ import org.apache.olingo.odata2.api.rt.RuntimeDelegate;
  * {@link org.apache.olingo.odata2.api.ODataServiceFactory} and populate it with their custom {@link EdmProvider}
  * and custom {@link ODataSingleProcessor} implementations.</p>
  *
- * @author
+ *  
  */
 public class ODataSingleProcessorService implements ODataService {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
index 68e03e0..7476839 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataExceptionMapperImpl.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.core.ep.ProviderFacadeImpl;
 /**
  * Creates an error response according to the format defined by the OData standard
  * if an exception occurs that is not handled elsewhere.
- * @author
+ *  
  */
 @Provider
 public class ODataExceptionMapperImpl implements ExceptionMapper<Exception> {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
index 3e094df..937b4c3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRedirectLocator.java
@@ -29,7 +29,7 @@ import javax.ws.rs.PUT;
 import javax.ws.rs.core.Response;
 
 /**
- * @author
+ *  
  */
 public class ODataRedirectLocator {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
index f13c54e..6f6018c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataRootLocator.java
@@ -46,7 +46,7 @@ import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
  * <code>/{custom path}{odata path}  e.g. http://host:port/webapp/bmw/odata.svc/$metadata</code><br>
  * The first segment defined by a servlet mapping belong to customer context and the following segments are OData specific.
  * </p>
- * @author
+ *  
  */
 public class ODataRootLocator {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
index 1cf6cef..5a8dc19 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/ODataSubLocator.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.core.ODataExceptionWrapper;
 import org.apache.olingo.odata2.core.ODataRequestHandler;
 
 /**
- * @author
+ *  
  */
 public final class ODataSubLocator {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
index aee16fd..e636031 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/RestUtil.java
@@ -51,7 +51,7 @@ import org.apache.olingo.odata2.core.commons.ContentType;
 import org.apache.olingo.odata2.core.commons.Decoder;
 
 /**
- * @author
+ *  
  */
 public class RestUtil {
   public static Response convertResponse(final ODataResponse odataResponse) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
index f4e01c7..cd67579 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/SubLocatorParameter.java
@@ -26,7 +26,7 @@ import javax.ws.rs.core.Request;
 import org.apache.olingo.odata2.api.ODataServiceFactory;
 
 /**
- * @author
+ *  
  */
 public class SubLocatorParameter {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
index 05edee1..578a66b 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rest/app/ODataApplication.java
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.core.rest.ODataExceptionMapperImpl;
 import org.apache.olingo.odata2.core.rest.ODataRootLocator;
 
 /**
- * @author
+ *  
  */
 public class ODataApplication extends Application {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
index 754b7dd..fb127e3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/rt/RuntimeDelegateImpl.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.core.processor.ODataSingleProcessorService;
 import org.apache.olingo.odata2.core.uri.UriParserImpl;
 
 /**
- * @author
+ *  
  */
 public class RuntimeDelegateImpl extends RuntimeDelegateInstance {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
index 3d8935c..96de274 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AcceptImpl.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.servicedocument.Accept;
 import org.apache.olingo.odata2.api.servicedocument.CommonAttributes;
 
 /**
- * @author
+ *  
  */
 public class AcceptImpl implements Accept {
   private String value;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
index 61fef53..962e948 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/AtomInfoImpl.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.servicedocument.Workspace;
 import org.apache.olingo.odata2.core.edm.provider.EdmEntitySetInfoImplProv;
 
 /**
- * @author
+ *  
  */
 public class AtomInfoImpl implements AtomInfo {
   private List<Workspace> workspaces;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
index c10e377..0610ff0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoriesImpl.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.servicedocument.Category;
 import org.apache.olingo.odata2.api.servicedocument.Fixed;
 
 /**
- * @author
+ *  
  */
 public class CategoriesImpl implements Categories {
   private String href;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
index 42f2733..39d19d4 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CategoryImpl.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.servicedocument.Category;
 import org.apache.olingo.odata2.api.servicedocument.CommonAttributes;
 
 /**
- * @author
+ *  
  */
 public class CategoryImpl implements Category {
   private String scheme;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
index 0bc8fe4..810e111 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CollectionImpl.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.servicedocument.ExtensionElement;
 import org.apache.olingo.odata2.api.servicedocument.Title;
 
 /**
- * @author
+ *  
  */
 public class CollectionImpl implements Collection {
   private Title title;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
index 6542e6b..7f76e05 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/CommonAttributesImpl.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.servicedocument.CommonAttributes;
 import org.apache.olingo.odata2.api.servicedocument.ExtensionAttribute;
 
 /**
- * @author
+ *  
  */
 public class CommonAttributesImpl implements CommonAttributes {
   private String base;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
index 3bf6783..16f04af 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionAttributeImpl.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.core.servicedocument;
 import org.apache.olingo.odata2.api.servicedocument.ExtensionAttribute;
 
 /**
- * @author
+ *  
  */
 public class ExtensionAttributeImpl implements ExtensionAttribute {
   private String namespace;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
index 284476e..3adcd9c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ExtensionElementImpl.java
@@ -24,7 +24,7 @@ import org.apache.olingo.odata2.api.servicedocument.ExtensionAttribute;
 import org.apache.olingo.odata2.api.servicedocument.ExtensionElement;
 
 /**
- * @author
+ *  
  */
 public class ExtensionElementImpl implements ExtensionElement {
   private String namespace;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
index 004c503..16c6717 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/ServiceDocumentImpl.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.servicedocument.AtomInfo;
 import org.apache.olingo.odata2.api.servicedocument.ServiceDocument;
 
 /**
- * @author
+ *  
  */
 public class ServiceDocumentImpl implements ServiceDocument {
   private AtomInfo atomInfo;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
index cbe91d6..8ff524a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/TitleImpl.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.core.servicedocument;
 import org.apache.olingo.odata2.api.servicedocument.Title;
 
 /**
- * @author
+ *  
  */
 public class TitleImpl implements Title {
   private String text;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
index 395ba99..a149cb1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/servicedocument/WorkspaceImpl.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.servicedocument.Title;
 import org.apache.olingo.odata2.api.servicedocument.Workspace;
 
 /**
- * @author
+ *  
  */
 public class WorkspaceImpl implements Workspace {
   private Title title;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
index 17390bd..b7bfabe 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeCreator.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.uri.SelectItem;
 import org.apache.olingo.odata2.core.uri.ExpandSelectTreeNodeImpl.AllKinds;
 
 /**
- * @author
+ *  
  */
 public class ExpandSelectTreeCreator {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
index 9e0c369..bc69e99 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/ExpandSelectTreeNodeImpl.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 
 /**
- * @author
+ *  
  */
 public class ExpandSelectTreeNodeImpl implements ExpandSelectTreeNode {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
index d6cc8a0..9d9bbcf 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/KeyPredicateImpl.java
@@ -22,7 +22,7 @@ import org.apache.olingo.odata2.api.edm.EdmProperty;
 import org.apache.olingo.odata2.api.uri.KeyPredicate;
 
 /**
- * @author
+ *  
  */
 public class KeyPredicateImpl implements KeyPredicate {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
index d1506a0..c43a628 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationPropertySegmentImpl.java
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.api.edm.EdmNavigationProperty;
 import org.apache.olingo.odata2.api.uri.NavigationPropertySegment;
 
 /**
- * @author
+ *  
  */
 public class NavigationPropertySegmentImpl implements NavigationPropertySegment {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
index e748129..97f1679 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/NavigationSegmentImpl.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.uri.KeyPredicate;
 import org.apache.olingo.odata2.api.uri.NavigationSegment;
 
 /**
- * @author
+ *  
  */
 public class NavigationSegmentImpl implements NavigationSegment {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
index fd11571..89bde77 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SelectItemImpl.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.uri.NavigationPropertySegment;
 import org.apache.olingo.odata2.api.uri.SelectItem;
 
 /**
- * @author
+ *  
  */
 public class SelectItemImpl implements SelectItem {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
index 49ed607..5344442 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/SystemQueryOption.java
@@ -19,7 +19,7 @@
 package org.apache.olingo.odata2.core.uri;
 
 /**
- * @author
+ *  
  */
 public enum SystemQueryOption {
   $format, $filter, $inlinecount, $orderby, $skiptoken, $skip, $top, $expand, $select;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
index c9f4621..ad74797 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriInfoImpl.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
 import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
 
 /**
- * @author
+ *  
  */
 public class UriInfoImpl implements UriInfo {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
index 1882044..ac46316 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriParserImpl.java
@@ -67,7 +67,7 @@ import org.apache.olingo.odata2.core.uri.expression.OrderByParserImpl;
 
 /**
  * Parser for the OData part of the URL.
- * @author
+ *  
  */
 public class UriParserImpl extends UriParser {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
index 054f421..ed98a0e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/UriType.java
@@ -21,7 +21,7 @@ package org.apache.olingo.odata2.core.uri;
 import java.util.ArrayList;
 
 /**
- * @author
+ *  
  */
 public enum UriType {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
index c5962ae..f475cdc 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/BinaryExpressionImpl.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionKind;
 import org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor;
 
 /**
- * @author
+ *  
  */
 public class BinaryExpressionImpl implements BinaryExpression {
   final protected InfoBinaryOperator operatorInfo;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
index 215d3fe..a43c747 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ExpressionParserInternalError.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.CommonExpression;
 
 /**
  * Internal error in the expression parser.
- * @author
+ *  
  */
 public class ExpressionParserInternalError extends ODataMessageException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
index 2f5f560..b0a7ef0 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterExpressionImpl.java
@@ -27,7 +27,7 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor;
 import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
 
 /**
- * @author
+ *  
  */
 public class FilterExpressionImpl implements FilterExpression {
   private final String filterString;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
index 52165ed..255b951 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParser.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.uri.expression.FilterExpression;
  *  <li>Expression node with EDM-types which are "null" are not considered during the parameter type validation, to the return type of the parent expression node will
  *  also become "null"</li>
  *  
- * @author
+ *  
  */
 public interface FilterParser {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
index b66603f..4a95bf1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserExceptionImpl.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.api.uri.expression.PropertyExpression;
  * input parameters for inserting into the exception text.<br>
  * The exception {@link ExpressionParserException} does not know the org.apache.olingo.odata2.core content
  * 
- * @author
+ *  
  */
 public class FilterParserExceptionImpl extends ExpressionParserException {
   private static final long serialVersionUID = 77L;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
index a39ba92..c622437 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/FilterParserImpl.java
@@ -47,7 +47,7 @@ import org.apache.olingo.odata2.core.edm.EdmBoolean;
 import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
 
 /**
- * @author
+ *  
  */
 public class FilterParserImpl implements FilterParser {
   /*do the static initialization*/

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
index b2abbe6..4c66a98 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoBinaryOperator.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.BinaryOperator;
 
 /**
  * Describes a binary operator which is allowed in OData expressions
- * @author
+ *  
  */
 class InfoBinaryOperator {
   private BinaryOperator operator;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
index e4150ad..95ca87e 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoMethod.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
 
 /**
  * Describes a method expression which is allowed in OData expressions
- * @author
+ *  
  */
 class InfoMethod {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
index a21f761..ac784d1 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/InfoUnaryOperator.java
@@ -25,7 +25,7 @@ import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
 
 /**
  * Describes a unary operator which is allowed in OData expressions
- * @author
+ *  
  */
 class InfoUnaryOperator {
   UnaryOperator operator;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
index 2caf44e..a19ccd2 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/JsonVisitor.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public class JsonVisitor implements ExpressionVisitor {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
index c6b94c2..7bbc278 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MemberExpressionImpl.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.uri.expression.ExpressionVisitor;
 import org.apache.olingo.odata2.api.uri.expression.MemberExpression;
 
 /**
- * @author
+ *  
  */
 public class MemberExpressionImpl implements BinaryExpression, MemberExpression {
   CommonExpression path;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
index 6a852fa..506b03c 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/MethodExpressionImpl.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.uri.expression.MethodExpression;
 import org.apache.olingo.odata2.api.uri.expression.MethodOperator;
 
 /**
- * @author
+ *  
  */
 public class MethodExpressionImpl implements MethodExpression {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
index a00dcd5..870de1f 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByExpressionImpl.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
 import org.apache.olingo.odata2.api.uri.expression.OrderExpression;
 
 /**
- * @author
+ *  
  */
 public class OrderByExpressionImpl implements OrderByExpression {
   private String orderbyString;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
index 432022f..3c6544d 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderByParser.java
@@ -39,7 +39,7 @@ import org.apache.olingo.odata2.api.uri.expression.OrderByExpression;
  *  <li>Expression node with EDM-types which are "null" are not considered during the parameter type validation, to the return type of the parent expression node will
  *  also become "null"</li>
  *  
- * @author
+ *  
  */
 public interface OrderByParser {
   /**

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
index 8bd1646..83e1fe3 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/OrderExpressionImpl.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.uri.expression.OrderExpression;
 import org.apache.olingo.odata2.api.uri.expression.SortOrder;
 
 /**
- * @author
+ *  
  */
 public class OrderExpressionImpl implements OrderExpression {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
index 2cd627f..d667020 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/ParameterSet.java
@@ -31,7 +31,7 @@ import org.apache.olingo.odata2.api.edm.EdmTypeKind;
  * @see InfoMethod 
  * @see InfoBinaryOperator 
  * @see InfoUnaryOperator
- * @author 
+ *   
  */
 @SuppressWarnings("javadoc")
 public class ParameterSet {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
index 61ee41d..6cbc165 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/Tokenizer.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
 
 /**
  * Expression tokenizer
- * @author
+ *  
  */
 public class Tokenizer {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
index 9433dd9..a942ba5 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerException.java
@@ -26,7 +26,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
  * This exception is thrown if there is an error during tokenizing.<br>
  * <b>This exception in not in the public API</b>, but may be added as cause for
  * the {@link org.apache.olingo.odata2.api.uri.expression.ExpressionParserException} exception.  
- * @author
+ *  
  */
 public class TokenizerException extends ODataMessageException {
   private static final long serialVersionUID = 77L;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
index 73d80f0..6b98f8a 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerExpectError.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.api.exception.ODataMessageException;
  * <br><br>
  * <b>This exception in not in the public API</b>, but may be added as cause for
  * the {@link ExpressionParserInternalError} exception. 
- * @author
+ *  
   */
 public class TokenizerExpectError extends ODataMessageException {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
index 68db3d8..05c5b79 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/TokenizerRTException.java
@@ -20,7 +20,7 @@ package org.apache.olingo.odata2.core.uri.expression;
 
 /**
  * Internal error. If used(thrown) the thrower
- * @author 
+ *   
  */
 public class TokenizerRTException extends Exception {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
----------------------------------------------------------------------
diff --git a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
index 373230b..1d07681 100644
--- a/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
+++ b/odata-core/src/main/java/org/apache/olingo/odata2/core/uri/expression/UnaryExpressionImpl.java
@@ -28,7 +28,7 @@ import org.apache.olingo.odata2.api.uri.expression.UnaryExpression;
 import org.apache.olingo.odata2.api.uri.expression.UnaryOperator;
 
 /**
- * @author
+ *  
  */
 public class UnaryExpressionImpl implements UnaryExpression {
   private InfoUnaryOperator operatorInfo = null;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
index 64f50c8..a0ac23b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ContentNegotiatorTest.java
@@ -34,7 +34,7 @@ import org.apache.olingo.odata2.core.uri.UriInfoImpl;
 import org.apache.olingo.odata2.core.uri.UriType;
 
 /**
- * @author
+ *  
  */
 public class ContentNegotiatorTest {
   private void negotiateContentType(final List<ContentType> contentTypes, final List<ContentType> supportedTypes, final String expected) throws ODataException {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
index a27402d..47fec4c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/DispatcherTest.java
@@ -66,7 +66,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
  * Tests for request dispatching according to URI type and HTTP method.
- * @author
+ *  
  */
 public class DispatcherTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
index 7fc1478..b3a5654 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataContextImplTest.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.processor.ODataContext;
 import org.apache.olingo.odata2.api.processor.ODataRequest;
 
 /**
- * @author
+ *  
  */
 public class ODataContextImplTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
index f37d918..19e4f27 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataExceptionWrapperTest.java
@@ -49,7 +49,7 @@ import org.apache.olingo.odata2.core.rest.ODataErrorHandlerCallbackImpl;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class ODataExceptionWrapperTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
index 70cfce2..c7db04d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataRequestHandlerValidationTest.java
@@ -78,7 +78,7 @@ import org.apache.olingo.odata2.testutil.mock.MockFacade;
 /**
  * Tests for the validation of HTTP method, URI path, query options,
  * and request-body content type.
- * @author
+ *  
  */
 public class ODataRequestHandlerValidationTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
index 5393885..1d6bf08 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ODataResponseTest.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class ODataResponseTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
index c5acee6..e38a6c2 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/PathSegmentTest.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.uri.PathSegment;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class PathSegmentTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
index a552e77..ba0233c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/batch/BatchRequestParserTest.java
@@ -44,7 +44,7 @@ import org.apache.olingo.odata2.core.PathInfoImpl;
 import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
- * @author
+ *  
  */
 public class BatchRequestParserTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
index 58df18e..64c0cc6 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/ContentTypeTest.java
@@ -57,7 +57,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 // accept-extension = ";" token [ "=" ( token | quoted-string ) ]
 
 /**
- * @author
+ *  
  */
 public class ContentTypeTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
index e5dcac6..884b5e2 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/DecoderTest.java
@@ -26,7 +26,7 @@ import org.junit.Test;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class DecoderTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
index 8ea7def..3c50d74 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/commons/EncoderTest.java
@@ -29,7 +29,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
  * Tests for percent-encoding.
- * @author
+ *  
  */
 public class EncoderTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
index 6ae2c77..f5e63cc 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/DebugInfoBodyTest.java
@@ -35,7 +35,7 @@ import org.apache.olingo.odata2.api.processor.ODataResponse;
 import org.apache.olingo.odata2.core.ep.util.JsonStreamWriter;
 
 /**
- * @author
+ *  
  */
 public class DebugInfoBodyTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
index 8d99409..b575c3a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/debug/ODataDebugResponseWrapperTest.java
@@ -59,7 +59,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 
 /**
  * Tests for the debug information output.
- * @author
+ *  
  */
 public class ODataDebugResponseWrapperTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
index bb03995..c4d907c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmImplTest.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.api.exception.ODataException;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmImplTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
index fef49a8..c56241e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeFacadeTest.java
@@ -37,7 +37,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
  * Tests for the parsing of URI literals
- * @author
+ *  
  */
 public class EdmSimpleTypeFacadeTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
index d00b3b9..a79b651 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/EdmSimpleTypeTest.java
@@ -47,7 +47,7 @@ import org.apache.olingo.odata2.api.exception.MessageReference;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmSimpleTypeTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
index 887cfcc..471065f 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationEndImplProvTest.java
@@ -36,7 +36,7 @@ import org.apache.olingo.odata2.api.edm.provider.EdmProvider;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmAssociationEndImplProvTest extends BaseTest {
   private static EdmAssociationEndImplProv associationEndProv;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
index 77f0637..eea1c3d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmAssociationImplProvTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.api.edm.provider.PropertyRef;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmAssociationImplProvTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
index 45d371f..9c3ac2b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmComplexTypeImplProvTest.java
@@ -44,7 +44,7 @@ import org.apache.olingo.odata2.api.edm.provider.SimpleProperty;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmComplexTypeImplProvTest extends BaseTest {
   private static EdmComplexTypeImplProv edmComplexType;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
index cf1b171..eaecec9 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityContainerImplProvTest.java
@@ -44,7 +44,7 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImport;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmEntityContainerImplProvTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
index 0760ffa..6ad9d42 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntitySetProvTest.java
@@ -49,7 +49,7 @@ import org.apache.olingo.odata2.api.edm.provider.NavigationProperty;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  *
  */
 public class EdmEntitySetProvTest extends BaseTest {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
index 975ee77..16d8e6d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmEntityTypeImplProvTest.java
@@ -46,7 +46,7 @@ import org.apache.olingo.odata2.api.edm.provider.SimpleProperty;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmEntityTypeImplProvTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
index a81f626..e5685f4 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmFunctionImportImplProvTest.java
@@ -48,7 +48,7 @@ import org.apache.olingo.odata2.api.edm.provider.ReturnType;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmFunctionImportImplProvTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
index 3e294fa..eae4846 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmNavigationPropertyImplProvTest.java
@@ -40,7 +40,7 @@ import org.apache.olingo.odata2.api.edm.provider.NavigationProperty;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmNavigationPropertyImplProvTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
index 2ab952a..01e087a 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmPropertyImplProvTest.java
@@ -44,7 +44,7 @@ import org.apache.olingo.odata2.core.edm.EdmSimpleTypeFacadeImpl;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class EdmPropertyImplProvTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
index 3f34fe1..48324bf 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/edm/provider/EdmServiceMetadataImplProvTest.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
 
 /**
- * @author
+ *  
  */
 public class EdmServiceMetadataImplProvTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
index 7aef3e4..a32b3b1 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/AbstractProviderTest.java
@@ -47,7 +47,7 @@ import org.apache.olingo.odata2.api.processor.ODataContext;
 import org.apache.olingo.odata2.api.uri.PathInfo;
 
 /**
- * @author
+ *  
 */
 public abstract class AbstractProviderTest extends AbstractXmlProducerTestHelper {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
index 1154c00..5c8dd43 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/BasicProviderTest.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.testutil.mock.EdmTestProvider;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class BasicProviderTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
index 57072ce..9aab0bb 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/LoadXMLFactoryTest.java
@@ -26,7 +26,7 @@ import javax.xml.stream.XMLOutputFactory;
 import org.junit.Test;
 
 /**
- * @author
+ *  
  */
 public class LoadXMLFactoryTest {
   // CHECKSTYLE:OFF

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
index 0cfef61..b121b0d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ODataEntityProviderPropertiesTest.java
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.api.ep.EntityProviderWriteProperties;
 import org.apache.olingo.odata2.testutil.fit.BaseTest;
 
 /**
- * @author
+ *  
  */
 public class ODataEntityProviderPropertiesTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
index aa2da02..5f0300e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/PerformanceTest.java
@@ -49,7 +49,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class PerformanceTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
index 956755f..b8eb88b 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/ProviderFacadeImplTest.java
@@ -50,7 +50,7 @@ import org.apache.olingo.odata2.testutil.helper.StringHelper;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class ProviderFacadeImplTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
index fc57790..fe0657c 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/aggregator/EntityInfoAggregatorTest.java
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.core.ep.AbstractProviderTest;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class EntityInfoAggregatorTest extends AbstractProviderTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
index d06d80c..11e5ddc 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AbstractConsumerTest.java
@@ -43,7 +43,7 @@ import org.apache.olingo.odata2.testutil.fit.BaseTest;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public abstract class AbstractConsumerTest extends BaseTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
index d2ada37..1815f2e 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/AtomServiceDocumentConsumerTest.java
@@ -45,7 +45,7 @@ import org.apache.olingo.odata2.api.servicedocument.ServiceDocument;
 import org.apache.olingo.odata2.api.servicedocument.Workspace;
 
 /**
- * @author
+ *  
  */
 public class AtomServiceDocumentConsumerTest {
   private static final String NAMESPACE_SAP = "http://www.sap.com/Data";

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
index 9d1467f..c7def2d 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryConsumerTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.api.ep.entry.ODataEntry;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonEntryConsumerTest extends AbstractConsumerTest {
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/420c1b73/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
----------------------------------------------------------------------
diff --git a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
index 093e346..2207b18 100644
--- a/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
+++ b/odata-core/src/test/java/org/apache/olingo/odata2/core/ep/consumer/JsonEntryDeepInsertFeedTest.java
@@ -41,7 +41,7 @@ import org.apache.olingo.odata2.core.exception.ODataRuntimeException;
 import org.apache.olingo.odata2.testutil.mock.MockFacade;
 
 /**
- * @author
+ *  
  */
 public class JsonEntryDeepInsertFeedTest extends AbstractConsumerTest {