You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by ch...@apache.org on 2013/09/20 15:34:12 UTC

[50/59] [abbrv] git commit: cleanup of jpa api

cleanup of jpa api


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

Branch: refs/heads/master
Commit: da6d5ca1a80f515ad7dac71c8765e0e653c8b423
Parents: afcc636
Author: Christian Amend <ch...@apache.org>
Authored: Fri Sep 20 15:05:04 2013 +0200
Committer: Christian Amend <ch...@apache.org>
Committed: Fri Sep 20 15:05:04 2013 +0200

----------------------------------------------------------------------
 .../processor/api/jpa/ODataJPAContext.java      |  53 ++++----
 .../processor/api/jpa/ODataJPAProcessor.java    |  39 +++---
 .../api/jpa/ODataJPAServiceFactory.java         |  57 ++++-----
 .../processor/api/jpa/access/JPAEdmBuilder.java |  67 ++++------
 .../jpa/access/JPAEdmMappingModelAccess.java    |  94 +++++++-------
 .../processor/api/jpa/access/JPAFunction.java   |  31 ++---
 .../processor/api/jpa/access/JPAJoinClause.java |  56 ++++-----
 .../api/jpa/access/JPAMethodContext.java        |  43 ++++---
 .../api/jpa/access/JPAMethodContextView.java    |  28 ++---
 .../processor/api/jpa/access/JPAProcessor.java  |  87 ++++++-------
 .../processor/api/jpa/access/package-info.java  |  28 ++---
 .../api/jpa/exception/ODataJPAException.java    |  43 ++++---
 .../jpa/exception/ODataJPAMessageService.java   |  34 ++---
 .../jpa/exception/ODataJPAModelException.java   |  81 +++++++-----
 .../jpa/exception/ODataJPARuntimeException.java |  87 +++++++------
 .../api/jpa/exception/package-info.java         |  30 ++---
 .../api/jpa/factory/JPAAccessFactory.java       |  46 +++----
 .../api/jpa/factory/JPQLBuilderFactory.java     |  55 ++++-----
 .../api/jpa/factory/ODataJPAAccessFactory.java  |  59 ++++-----
 .../api/jpa/factory/ODataJPAFactory.java        |  44 +++----
 .../processor/api/jpa/factory/package-info.java |  28 ++---
 .../processor/api/jpa/jpql/JPQLContext.java     |  67 +++++-----
 .../processor/api/jpa/jpql/JPQLContextType.java |  28 ++---
 .../processor/api/jpa/jpql/JPQLContextView.java |  31 +++--
 .../api/jpa/jpql/JPQLJoinContextView.java       |  31 +++--
 .../jpql/JPQLJoinSelectSingleContextView.java   |  31 +++--
 .../api/jpa/jpql/JPQLSelectContextView.java     |  28 ++---
 .../jpa/jpql/JPQLSelectSingleContextView.java   |  28 ++---
 .../processor/api/jpa/jpql/JPQLStatement.java   |  53 ++++----
 .../processor/api/jpa/jpql/package-info.java    |  28 ++---
 .../api/jpa/model/JPAEdmAssociationEndView.java |  57 ++++-----
 .../api/jpa/model/JPAEdmAssociationSetView.java |  30 ++---
 .../api/jpa/model/JPAEdmAssociationView.java    |  66 +++++-----
 .../processor/api/jpa/model/JPAEdmBaseView.java |  40 +++---
 .../jpa/model/JPAEdmComplexPropertyView.java    |  31 +++--
 .../api/jpa/model/JPAEdmComplexTypeView.java    |  56 ++++-----
 .../jpa/model/JPAEdmEntityContainerView.java    |  37 +++---
 .../api/jpa/model/JPAEdmEntitySetView.java      |  36 +++---
 .../api/jpa/model/JPAEdmEntityTypeView.java     |  38 +++---
 .../api/jpa/model/JPAEdmExtension.java          |  38 +++---
 .../api/jpa/model/JPAEdmFunctionImportView.java |  33 +++--
 .../processor/api/jpa/model/JPAEdmKeyView.java  |  33 +++--
 .../processor/api/jpa/model/JPAEdmMapping.java  |  34 ++---
 .../api/jpa/model/JPAEdmModelView.java          |  34 +++--
 .../jpa/model/JPAEdmNavigationPropertyView.java |  34 +++--
 .../api/jpa/model/JPAEdmPropertyView.java       |  47 ++++---
 .../JPAEdmReferentialConstraintRoleView.java    |  36 +++---
 .../model/JPAEdmReferentialConstraintView.java  |  31 +++--
 .../api/jpa/model/JPAEdmSchemaView.java         |  55 ++++-----
 .../jpa/model/mapping/JPAAttributeMapType.java  | 115 ++++++++---------
 .../jpa/model/mapping/JPAEdmMappingModel.java   |  43 +++----
 .../mapping/JPAEdmMappingModelFactory.java      |  26 ++--
 .../model/mapping/JPAEmbeddableTypeMapType.java |  95 +++++++-------
 .../mapping/JPAEmbeddableTypesMapType.java      |  45 +++----
 .../jpa/model/mapping/JPAEntityTypeMapType.java | 123 +++++++++----------
 .../model/mapping/JPAEntityTypesMapType.java    |  45 +++----
 .../mapping/JPAPersistenceUnitMapType.java      |  59 ++++-----
 .../model/mapping/JPARelationshipMapType.java   |  73 ++++++-----
 .../api/jpa/model/mapping/package-info.java     |  31 ++---
 .../processor/api/jpa/model/package-info.java   |  30 ++---
 .../odata2/processor/api/jpa/package-info.java  |  30 ++---
 61 files changed, 1407 insertions(+), 1489 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 0f7027b..83dc6a4 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa;
 
@@ -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>
  * 
- *   <br>
+ * <br>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAAccessFactory
@@ -56,7 +56,7 @@ public interface ODataJPAContext {
    * The method sets the Java Persistence Unit Name into the context.
    * 
    * @param pUnitName
-   *            is the Java Persistence Unit Name.
+   * is the Java Persistence Unit Name.
    * 
    */
   public void setPersistenceUnitName(String pUnitName);
@@ -72,9 +72,8 @@ public interface ODataJPAContext {
    * The method sets the OData Processor for JPA into the context.
    * 
    * @param processor
-   *            is the specific implementation of
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAProcessor}
-   *            for processing OData service requests.
+   * is the specific implementation of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAProcessor} for
+   * processing OData service requests.
    */
   public void setODataProcessor(ODataProcessor processor);
 
@@ -89,9 +88,8 @@ public interface ODataJPAContext {
    * The method sets EDM provider into the context
    * 
    * @param edmProvider
-   *            is the specific implementation of
-   *            {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} for
-   *            transforming Java persistence models to Entity Data Model
+   * is the specific implementation of {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} for
+   * transforming Java persistence models to Entity Data Model
    * 
    */
   public void setEdmProvider(EdmProvider edmProvider);
@@ -112,7 +110,7 @@ public interface ODataJPAContext {
    * context.
    * 
    * @param emf
-   *            is of type {@link javax.persistence.EntityManagerFactory}
+   * is of type {@link javax.persistence.EntityManagerFactory}
    * 
    */
   public void setEntityManagerFactory(EntityManagerFactory emf);
@@ -128,8 +126,7 @@ public interface ODataJPAContext {
    * The method sets OData context into the context.
    * 
    * @param ctx
-   *            is an OData context of type
-   *            {@link org.apache.olingo.odata2.api.processor.ODataContext}
+   * is an OData context of type {@link org.apache.olingo.odata2.api.processor.ODataContext}
    */
   public void setODataContext(ODataContext ctx);
 
@@ -138,7 +135,7 @@ public interface ODataJPAContext {
    * mapping model is an XML document based on JPAEDMMappingModel.xsd
    * 
    * @param name
-   *            is the name of JPA EDM mapping model
+   * is the name of JPA EDM mapping model
    */
   public void setJPAEdmMappingModel(String name);
 
@@ -165,8 +162,7 @@ public interface ODataJPAContext {
    * several times overwrites already set extension instance in the context.
    * 
    * @param jpaEdmExtension
-   *            is an instance of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmExtension}
+   * is an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmExtension}
    * 
    */
   public void setJPAEdmExtension(JPAEdmExtension jpaEdmExtension);
@@ -174,7 +170,8 @@ public interface ODataJPAContext {
   /**
    * The method returns the JPA Edm Extension instance set into the context.
    * 
-   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEmbeddableTypeMapType}
+   * @return an instance of type
+   * {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEmbeddableTypeMapType}
    */
   public JPAEdmExtension getJPAEdmExtension();
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 4513445..441d38e 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa;
 
@@ -27,23 +27,20 @@ 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.
  * 
- *  
+ * 
  * 
  * 
  */
 public abstract class ODataJPAProcessor extends ODataSingleProcessor {
 
   /**
-   * An instance of
-   * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext} object
+   * An instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext} object
    */
   protected ODataJPAContext oDataJPAContext;
 
   /**
-   * An instance of
-   * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}. The
-   * instance is created using
-   * {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory}.
+   * An instance of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}. The
+   * instance is created using {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory}.
    */
   protected JPAProcessor jpaProcessor;
 
@@ -59,7 +56,7 @@ public abstract class ODataJPAProcessor extends ODataSingleProcessor {
    * Constructor
    * 
    * @param oDataJPAContext
-   *            non null OData JPA Context object
+   * non null OData JPA Context object
    */
   public ODataJPAProcessor(final ODataJPAContext oDataJPAContext) {
     if (oDataJPAContext == null) {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 ae38e2e..7ad7243 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa;
 
@@ -30,8 +30,8 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
 
 /**
  * <p>
- * Extend this factory class and create own instance of
- * {@link org.apache.olingo.odata2.api.ODataService} that transforms Java Persistence
+ * Extend this factory class and create own instance of {@link org.apache.olingo.odata2.api.ODataService} that
+ * transforms Java Persistence
  * Models into an OData Service. The factory class instantiates instances of
  * type {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider} and
  * {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor}. The OData
@@ -40,8 +40,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  * </p>
  * <p>
  * The factory implementation is passed as servlet init parameter to a JAX-RS
- * runtime which will instantiate a {@link org.apache.olingo.odata2.api.ODataService}
- * implementation using this factory.
+ * runtime which will instantiate a {@link org.apache.olingo.odata2.api.ODataService} implementation using this factory.
  * </p>
  * 
  * <p>
@@ -52,8 +51,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  * 
  * <b>Sample Configuration:</b>
  * 
- * <pre>
- * {@code
+ * <pre> {@code
  * <servlet>
  *  <servlet-name>ReferenceScenarioServlet</servlet-name>
  *  <servlet-class>org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet</servlet-class>
@@ -71,8 +69,7 @@ import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
  *  </init-param>
  *  <load-on-startup>1</load-on-startup>
  * </servlet>
- * }
- * </pre>
+ * } </pre>
  */
 
 public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
@@ -121,17 +118,16 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
 
   /**
    * Implement this method and initialize OData JPA Context. It is mandatory
-   * to set an instance of type {@link javax.persistence.EntityManagerFactory}
-   * into the context. An exception of type
-   * {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException}
-   * is thrown if EntityManagerFactory is not initialized. <br>
+   * to set an instance of type {@link javax.persistence.EntityManagerFactory} into the context. An exception of type
+   * {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException} is thrown if
+   * EntityManagerFactory is not initialized. <br>
    * <br>
    * <b>Sample Code:</b> <code>
-   * 	<p>public class JPAReferenceServiceFactory extends ODataJPAServiceFactory{</p>
-   * 	
-   * 	<blockquote>private static final String PUNIT_NAME = "punit";
+   * <p>public class JPAReferenceServiceFactory extends ODataJPAServiceFactory{</p>
+   * 
+   * <blockquote>private static final String PUNIT_NAME = "punit";
    * <br>
-   * public ODataJPAContext initializeODataJPAContext() { 
+   * public ODataJPAContext initializeODataJPAContext() {
    * <blockquote>ODataJPAContext oDataJPAContext = this.getODataJPAContext();
    * <br>
    * EntityManagerFactory emf = Persistence.createEntityManagerFactory(PUNIT_NAME);
@@ -143,8 +139,7 @@ public abstract class ODataJPAServiceFactory extends ODataServiceFactory {
    * } </code>
    * <p>
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
    * @throws ODataJPARuntimeException
    */
   public abstract ODataJPAContext initializeODataJPAContext() throws ODataJPARuntimeException;

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 30d7f1c..110a1f1 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
@@ -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.
  * 
- *  
+ * 
  * 
  */
 public interface JPAEdmBuilder {
@@ -34,37 +34,20 @@ public interface JPAEdmBuilder {
    * processes EDM JPA Containers which could be accessed using the following
    * views,
    * <ul>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView}
-   * </li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}</li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView} </li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}</li>
    * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmBaseView}</li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView}
-   * </li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}</li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}
-   * </li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}</li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}</li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView} </li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}</li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView} </li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}</li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}</li>
    * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView}</li>
    * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView}</li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
-   * </li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView}</li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView}
-   * </li>
-   * <li>
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
-   * </li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView} </li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView}</li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView} </li>
+   * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView} </li>
    * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView}</li>
    * </ul>
    * 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 59ca79a..216db55 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
@@ -23,7 +23,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingMod
 /**
  * Interface provides methods to access JPA EDM mapping model.
  * 
- *  
+ * 
  * @see JPAEdmMappingModel
  * 
  */
@@ -31,9 +31,8 @@ public interface JPAEdmMappingModelAccess {
 
   /**
    * The method searches and loads the mapping model stored in &ltfile&gt.xml
-   * file into the java object
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel}
-   * . The name of the file is set into ODataJPAContext method.
+   * file into the java object {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel} . The
+   * name of the file is set into ODataJPAContext method.
    * 
    * @see org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext#setJPAEdmMappingModel(String)
    */
@@ -43,7 +42,7 @@ public interface JPAEdmMappingModelAccess {
    * The method returns if there exists a mapping model.
    * 
    * @return true - if there exists a mapping model for the OData service else
-   *         false
+   * false
    */
   public boolean isMappingModelExists();
 
@@ -51,8 +50,7 @@ public interface JPAEdmMappingModelAccess {
    * The method returns a JPA EDM mapping model Java object. The mapping model
    * in XML files is un-marshaled into the Java object.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.mapping.JPAEdmMappingModel}
    */
   public JPAEdmMappingModel getJPAEdmMappingModel();
 
@@ -60,9 +58,9 @@ public interface JPAEdmMappingModelAccess {
    * The method returns EDM Schema namespace for the persistence unit name
    * 
    * @param persistenceUnitName
-   *            is the Java persistence unit name
+   * is the Java persistence unit name
    * @return EDM schema name space mapped to Java persistence unit name or
-   *         null if no mapping is available
+   * null if no mapping is available
    */
   public String mapJPAPersistenceUnit(String persistenceUnitName);
 
@@ -71,9 +69,9 @@ public interface JPAEdmMappingModelAccess {
    * type name
    * 
    * @param jpaEntityTypeName
-   *            is the Java persistence entity type name
+   * is the Java persistence entity type name
    * @return EDM entity type name mapped to Java persistence entity type name
-   *         or null if no mapping is available
+   * or null if no mapping is available
    */
   public String mapJPAEntityType(String jpaEntityTypeName);
 
@@ -82,9 +80,9 @@ public interface JPAEdmMappingModelAccess {
    * type name
    * 
    * @param jpaEntityTypeName
-   *            is the Java persistence entity type name
+   * is the Java persistence entity type name
    * @return EDM entity set name mapped to Java persistence entity type name
-   *         or null if no mapping is available
+   * or null if no mapping is available
    */
   public String mapJPAEntitySet(String jpaEntityTypeName);
 
@@ -93,11 +91,11 @@ public interface JPAEdmMappingModelAccess {
    * attribute name.
    * 
    * @param jpaEntityTypeName
-   *            is the Java persistence entity type name
+   * is the Java persistence entity type name
    * @param jpaAttributeName
-   *            is the Java persistence attribute name
+   * is the Java persistence attribute name
    * @return EDM property name mapped to Java persistence attribute name or
-   *         null if no mapping is available
+   * null if no mapping is available
    */
   public String mapJPAAttribute(String jpaEntityTypeName, String jpaAttributeName);
 
@@ -106,11 +104,11 @@ public interface JPAEdmMappingModelAccess {
    * entity relationship name.
    * 
    * @param jpaEntityTypeName
-   *            is the Java persistence entity type name
+   * is the Java persistence entity type name
    * @param jpaRelationshipName
-   *            is the Java persistence relationship name
+   * is the Java persistence relationship name
    * @return EDM navigation property name mapped to Java persistence entity
-   *         relationship name or null if no mapping is available
+   * relationship name or null if no mapping is available
    */
   public String mapJPARelationship(String jpaEntityTypeName, String jpaRelationshipName);
 
@@ -119,9 +117,9 @@ public interface JPAEdmMappingModelAccess {
    * name.
    * 
    * @param jpaEmbeddableTypeName
-   *            is the Java persistence embeddable type name
+   * is the Java persistence embeddable type name
    * @return EDM complex type name mapped to Java persistence entity
-   *         relationship name or null if no mapping is available
+   * relationship name or null if no mapping is available
    */
   public String mapJPAEmbeddableType(String jpaEmbeddableTypeName);
 
@@ -130,11 +128,11 @@ public interface JPAEdmMappingModelAccess {
    * type's attribute name.
    * 
    * @param jpaEmbeddableTypeName
-   *            is the Java persistence
+   * is the Java persistence
    * @param jpaAttributeName
-   *            is the Java persistence attribute name
+   * is the Java persistence attribute name
    * @return EDM property name mapped to Java persistence attribute name or
-   *         null if no mapping is available
+   * null if no mapping is available
    */
   public String mapJPAEmbeddableTypeAttribute(String jpaEmbeddableTypeName, String jpaAttributeName);
 
@@ -143,9 +141,9 @@ public interface JPAEdmMappingModelAccess {
    * model
    * 
    * @param jpaEntityTypeName
-   *            is the name of JPA Entity Type
+   * is the name of JPA Entity Type
    * @return <b>true</b> - if JPA Entity should be excluded<br>
-   *         <b>false</b> - if JPA Entity should be not be excluded
+   * <b>false</b> - if JPA Entity should be not be excluded
    * 
    */
   public boolean checkExclusionOfJPAEntityType(String jpaEntityTypeName);
@@ -155,11 +153,11 @@ public interface JPAEdmMappingModelAccess {
    * Entity Type
    * 
    * @param jpaEntityTypeName
-   *            is the name of JPA Entity Type
+   * is the name of JPA Entity Type
    * @param jpaAttributeName
-   *            is the name of JPA attribute
+   * is the name of JPA attribute
    * @return <b>true</b> - if JPA attribute should be excluded<br>
-   *         <b>false</b> - if JPA attribute should be not be excluded
+   * <b>false</b> - if JPA attribute should be not be excluded
    * 
    */
   public boolean checkExclusionOfJPAAttributeType(String jpaEntityTypeName, String jpaAttributeName);
@@ -169,9 +167,9 @@ public interface JPAEdmMappingModelAccess {
    * from EDM model
    * 
    * @param jpaEmbeddableTypeName
-   *            is the name of JPA Embeddable Type
+   * is the name of JPA Embeddable Type
    * @return <b>true</b> - if JPA Embeddable Type should be excluded<br>
-   *         <b>false</b> - if JPA Embeddable Type should be not be excluded
+   * <b>false</b> - if JPA Embeddable Type should be not be excluded
    * 
    */
   public boolean checkExclusionOfJPAEmbeddableType(String jpaEmbeddableTypeName);
@@ -181,12 +179,12 @@ public interface JPAEdmMappingModelAccess {
    * excluded from EDM model
    * 
    * @param jpaEmbeddableTypeName
-   *            is the name of JPA Embeddable Attribute Type
+   * is the name of JPA Embeddable Attribute Type
    * @param jpaAttributeName
-   * 				is the name of JPA Attribute name
+   * is the name of JPA Attribute name
    * @return <b>true</b> - if JPA Embeddable Attribute Type should be excluded<br>
-   *         <b>false</b> - if JPA Embeddable Attribute Type should be not be
-   *         excluded
+   * <b>false</b> - if JPA Embeddable Attribute Type should be not be
+   * excluded
    * 
    */
   public boolean checkExclusionOfJPAEmbeddableAttributeType(String jpaEmbeddableTypeName, String jpaAttributeName);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 f266411..4e32b0c 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
@@ -28,7 +28,7 @@ import java.lang.reflect.Type;
  * <li>Custom Operation (Annotated with EDM Annotation FunctionImport)</li>
  * </ol>
  * 
- *  
+ * 
  * 
  */
 public class JPAFunction {
@@ -38,7 +38,8 @@ 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/da6d5ca1/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 2c57474..f0a4c8d 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
@@ -29,7 +29,7 @@ package org.apache.olingo.odata2.processor.api.jpa.access;
  * </ol>
  * </b>
  * 
- *  
+ * 
  * 
  */
 public class JPAJoinClause {
@@ -43,7 +43,7 @@ public class JPAJoinClause {
    * <li>INNER - inner join
    * </ol>
    * 
-   *  
+   * 
    * 
    */
   public enum JOIN {
@@ -100,23 +100,22 @@ public class JPAJoinClause {
    * Constructor for creating elements of JPA Join Clause container.
    * 
    * @param entityName
-   *            is the name of the JPA entity participating in the join
+   * is the name of the JPA entity participating in the join
    * @param entityAlias
-   *            is the alias for the JPA entity participating in the join
+   * is the alias for the JPA entity participating in the join
    * @param entityRelationShip
-   *            is the name of the JPA entity relationship participating in
-   *            the join
+   * is the name of the JPA entity relationship participating in
+   * the join
    * @param entityRelationShipAlias
-   *            is the alias name of the JPA entity relationship participating
-   *            in the join
+   * is the alias name of the JPA entity relationship participating
+   * in the join
    * @param joinCondition
-   *            is the condition on which the joins should occur
+   * is the condition on which the joins should occur
    * @param joinType
-   *            is the type of join
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN}
-   *            to execute
+   * is the type of join {@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;
@@ -137,9 +136,8 @@ public class JPAJoinClause {
   }
 
   /**
-   * The method returns the type of
-   * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN}
-   * that can be used for building JPQL join statements.
+   * The method returns the type of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause.JOIN} that
+   * can be used for building JPQL join statements.
    * 
    * @return join type
    */

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 1f0f14c..fd44200 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
@@ -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.
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.access.JPAMethodContextView
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
  * 
@@ -81,14 +81,15 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
    * the method instantiates an instance of type JPAMethodContextBuilder.
    * 
    * @param contextType
-   *            indicates the type of JPQLContextBuilder to instantiate.
+   * indicates the type of JPQLContextBuilder to instantiate.
    * @param resultsView
-   *            is the OData request view
+   * is the OData request view
    * @return {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAMethodContext.JPAMethodContextBuilder}
    * 
    * @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);
   }
 
@@ -96,7 +97,7 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
    * The abstract class is extended by specific JPA Method Context Builder to
    * build JPA Method Context types.
    * 
-   *  
+   * 
    * 
    */
   public static abstract class JPAMethodContextBuilder {
@@ -112,8 +113,10 @@ public abstract class JPAMethodContext implements JPAMethodContextView {
 
     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);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 fab588f..fb057a0 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
@@ -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.
  * 
- *  
+ * 
  * 
  */
 public interface JPAMethodContextView {

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 1d86226..d13dd77 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.access;
 
@@ -36,9 +36,9 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAModelExcepti
 import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeException;
 
 /**
- * The interface provides methods for processing OData Requests for Create, Read, Update, Delete operations. 
- * Pass the OData request or parsed OData request (Map of properties) as request. 
- * A JPA entity is returned as a response. 
+ * The interface provides methods for processing OData Requests for Create, Read, Update, Delete operations.
+ * Pass the OData request or parsed OData request (Map of properties) as request.
+ * A JPA entity is returned as a response.
  * 
  */
 public interface JPAProcessor {
@@ -47,14 +47,14 @@ public interface JPAProcessor {
    * list of Objects of type representing JPA Entity Types.
    * 
    * @param <T>
-   *            Template parameter representing Java Persistence Entity Type.
-   *            <p>
-   *            <b>Note:-</b> Default parameter is Object.
-   *            </p>
+   * Template parameter representing Java Persistence Entity Type.
+   * <p>
+   * <b>Note:-</b> Default parameter is Object.
+   * </p>
    * 
    * @param requestView
-   *            is an OData request for querying an entity set
-   *            <p>
+   * is an OData request for querying an entity set
+   * <p>
    * @return list of objects representing JPA entity types
    **/
   public <T> List<T> process(GetEntitySetUriInfo requestView)
@@ -65,15 +65,15 @@ public interface JPAProcessor {
    * Object of type representing JPA Entity Type.
    * 
    * @param <T>
-   *            Template parameter representing Java Persistence Entity Type.
-   *            <p>
-   *            <b>Note:-</b> Default parameter is Object.
-   *            </p>
+   * Template parameter representing Java Persistence Entity Type.
+   * <p>
+   * <b>Note:-</b> Default parameter is Object.
+   * </p>
    * 
    * @param requestView
-   *            OData request for reading an entity
+   * OData request for reading an entity
    * 
-   *            <p>
+   * <p>
    * @return object representing JPA entity type
    **/
   public <T> Object process(GetEntityUriInfo requestView)
@@ -83,7 +83,7 @@ public interface JPAProcessor {
    * Processes OData request for fetching Entity count. The method returns JPA Entity count
    * 
    * @param requestView
-   *            OData request for counting an entity set
+   * OData request for counting an entity set
    * @return long value representing count of JPA entity set
    * 
    * @throws ODataJPAModelException
@@ -97,8 +97,8 @@ public interface JPAProcessor {
    * Processes OData request for fetching Entity count. The method returns count of target entity.
    * This is specific to situation where cardinality is 1:1
    * 
-   * @param resultsView 
-   *      OData request for counting target entity.
+   * @param resultsView
+   * OData request for counting target entity.
    * @return long value representing count of JPA entity
    * 
    * @throws ODataJPAModelException
@@ -113,7 +113,7 @@ public interface JPAProcessor {
    * operations return type has multiplicity of ONE.
    * 
    * @param requestView
-   *            OData request for executing function import
+   * OData request for executing function import
    * @return result of executing function import
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
@@ -122,11 +122,11 @@ public interface JPAProcessor {
       throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
-   * Processes OData request for executing $links OData command for N:1 relation. 
+   * Processes OData request for executing $links OData command for N:1 relation.
    * The method returns an Object of type representing OData entity.
    * 
    * @param uriParserResultView
-   *          OData request for Entity Link URI
+   * OData request for Entity Link URI
    * @return an object representing JPA entity
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
@@ -135,11 +135,11 @@ public interface JPAProcessor {
       throws ODataJPAModelException, ODataJPARuntimeException;
 
   /**
-   * Processes OData request for executing $links OData command for N:1 relation. 
+   * Processes OData request for executing $links OData command for N:1 relation.
    * The method returns an Object of type representing OData entity.
    * 
    * @param uriParserResultView
-   *          OData request for Entity Set Link URI
+   * OData request for Entity Set Link URI
    * @return a list of object representing JPA entities
    * @throws ODataJPAModelException
    * @throws ODataJPARuntimeException
@@ -149,7 +149,7 @@ public interface JPAProcessor {
 
   /**
    * Processes OData request for creating Entity. The method returns an Object
-   * which is created.  A Null reference implies object was not created.
+   * which is created. A Null reference implies object was not created.
    * 
    * @param createView
    * @param content
@@ -166,7 +166,8 @@ public interface JPAProcessor {
       ODataJPARuntimeException;
 
   /**
-   * Processes OData request for creating Entity. The method expects a parsed OData request which is a Map of properties.
+   * Processes OData request for creating Entity. The method expects a parsed OData request which is a Map of
+   * properties.
    * The method returns an Object that is created. A Null reference implies object was not created.
    * 
    * @param createView
@@ -184,7 +185,7 @@ public interface JPAProcessor {
 
   /**
    * Processes OData request for updating Entity. The method returns an Object
-   * which is updated.  A Null reference implies object was not created.
+   * which is updated. A Null reference implies object was not created.
    * 
    * @param deleteuriInfo
    * @param contentType
@@ -199,7 +200,7 @@ public interface JPAProcessor {
 
   /**
    * Processes OData request for updating Entity. The method returns an Object
-   * which is updated.  A Null reference implies object was not created.
+   * which is updated. A Null reference implies object was not created.
    * 
    * @param deleteuriInfo
    * @param contentType
@@ -213,7 +214,7 @@ public interface JPAProcessor {
 
   /**
    * Processes OData request for deleting Entity. The method returns an Object
-   * which is deleted.  A Null reference implies object was not created.
+   * which is deleted. A Null reference implies object was not created.
    * 
    * @param deleteuriInfo
    * @param contentType
@@ -230,7 +231,7 @@ public interface JPAProcessor {
    * $links OData command.
    * 
    * @param uriParserResultView
-   *          OData request for creating Links
+   * OData request for creating Links
    * @param content
    * @param requestContentType
    * @param contentType
@@ -247,7 +248,7 @@ public interface JPAProcessor {
    * $links OData command.
    * 
    * @param uriParserResultView
-   *          OData request for updating Links
+   * OData request for updating Links
    * @param content
    * @param requestContentType
    * @param contentType

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 de90b3c..38671c1 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
@@ -1,26 +1,26 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 /**
  * <h3>OData JPA Processor API Library - Java Persistence Access</h3>
  * The library provides a set of APIs to access Java Persistence Models and Data.
  * 
- *  
+ * 
  */
 package org.apache.olingo.odata2.processor.api.jpa.access;
 

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 cc6eec4..3347ee0 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.exception;
 
@@ -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.
  * 
- *  
+ * 
  * 
  */
 public abstract class ODataJPAException extends ODataException {
@@ -46,19 +46,18 @@ public abstract class ODataJPAException extends ODataException {
   }
 
   /**
-   * The method creates a Reference to Message Object
-   * {@link org.apache.olingo.odata2.api.exception.MessageReference} . The message
+   * The method creates a Reference to Message Object {@link org.apache.olingo.odata2.api.exception.MessageReference} .
+   * The message
    * text key is derived out of parameters clazz.messageReferenceKey.
    * 
    * @param clazz
-   *            is name of the class extending
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAException}
+   * is name of the class extending {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAException}
    * @param messageReferenceKey
-   *            is the key of the message
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.exception.MessageReference}
+   * is the key of the message
+   * @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/da6d5ca1/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 1a728e2..97dc1bf 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.exception;
 
@@ -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.
  * 
- *  
+ * 
  * @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
@@ -40,9 +40,9 @@ public interface ODataJPAMessageService {
    * {@link org.apache.olingo.odata2.api.exception.MessageReference}.
    * 
    * @param context
-   *            is a Message Reference
-   *        exception
-   *        	  is a Throwable Exception
+   * is a Message Reference
+   * exception
+   * is a Throwable Exception
    * @return a language dependent message text
    */
   public String getLocalizedMessage(MessageReference context, Throwable exception);

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/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 b3790fa..7800b9e 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
@@ -1,20 +1,20 @@
 /*******************************************************************************
  * Licensed to the Apache Software Foundation (ASF) under one
- *        or more contributor license agreements.  See the NOTICE file
- *        distributed with this work for additional information
- *        regarding copyright ownership.  The ASF licenses this file
- *        to you under the Apache License, Version 2.0 (the
- *        "License"); you may not use this file except in compliance
- *        with the License.  You may obtain a copy of the License at
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
  * 
- *          http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  * 
- *        Unless required by applicable law or agreed to in writing,
- *        software distributed under the License is distributed on an
- *        "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- *        KIND, either express or implied.  See the License for the
- *        specific language governing permissions and limitations
- *        under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  ******************************************************************************/
 package org.apache.olingo.odata2.processor.api.jpa.exception;
 
@@ -25,27 +25,41 @@ 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.
  * 
- *  
+ * 
  * 
  */
 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 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 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) {
     super(localizedMessage, e, msgRef);
@@ -56,18 +70,19 @@ public class ODataJPAModelException extends ODataJPAException {
    * with localized error texts.
    * 
    * @param messageReference
-   *            is a <b>mandatory</b> parameter referring to a literal that
-   *            could be translated to localized error texts.
+   * is a <b>mandatory</b> parameter referring to a literal that
+   * could be translated to localized error texts.
    * @param e
-   *            is an optional parameter representing the previous exception
-   *            in the call stack
+   * is an optional parameter representing the previous exception
+   * in the call stack
    * @return an instance of ODataJPAModelException which can be then raised.
    * @throws ODataJPARuntimeException
    */
   public static ODataJPAModelException throwException(final MessageReference messageReference, final Throwable e) {
 
     ODataJPAMessageService messageService;
-    messageService = ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
+    messageService =
+        ODataJPAFactory.createFactory().getODataJPAAccessFactory().getODataJPAMessageService(DEFAULT_LOCALE);
     String message = messageService.getLocalizedMessage(messageReference, e);
     return new ODataJPAModelException(message, e, messageReference);
   }