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:11 UTC

[49/59] [abbrv] cleanup of jpa api

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/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 34721a0..b3195c3 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
@@ -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,28 +28,44 @@ 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.
  * 
- *  
+ * 
  * 
  */
 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 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 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) {
     super(localizedMessage, e, msgRef);
@@ -60,17 +76,18 @@ public class ODataJPARuntimeException 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 ODataJPARuntimeException which can be then raised.
    * @throws ODataJPARuntimeException
    */
   public static ODataJPARuntimeException 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 ODataJPARuntimeException(message, e, messageReference);
   }

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/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 68c149b..5059bb4 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
@@ -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.
  ******************************************************************************/
 /**
  * <h3>OData JPA Processor API Library - Exceptions</h3>
@@ -22,10 +22,10 @@
  * <ol><li>Model Exception</li>
  * <li>Runtime Exception</li></ol>
  * <br>
- * The Model Exception is thrown while processing JPA metamodels and 
+ * The Model Exception is thrown while processing JPA metamodels and
  * runtime exception is thrown while processing persistence data.
  * 
- *  
+ * 
  */
 package org.apache.olingo.odata2.processor.api.jpa.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/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 bfe73a5..02268de 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
@@ -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.factory;
 
@@ -30,7 +30,7 @@ import org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView;
  * <li>JPA Processor</li>
  * </ol>
  * 
- *  
+ * 
  * 
  */
 public interface JPAAccessFactory {
@@ -40,10 +40,8 @@ public interface JPAAccessFactory {
    * EDM models from Java persistence models.
    * 
    * @param oDataJPAContext
-   *            a non null instance of
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView}
+   * a non null instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmModelView}
    */
   public JPAEdmModelView getJPAEdmModelView(ODataJPAContext oDataJPAContext);
 
@@ -53,10 +51,8 @@ public interface JPAAccessFactory {
    * processing JPQL statements.
    * 
    * @param oDataJPAContext
-   *            a non null instance of
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}
+   * a non null instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAProcessor}
    */
   public JPAProcessor getJPAProcessor(ODataJPAContext oDataJPAContext);
 
@@ -66,10 +62,8 @@ public interface JPAAccessFactory {
    * the mapping details maintained for an OData service
    * 
    * @param oDataJPAContext
-   *            a non null instance of
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAccess}
+   * a non null instance of {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAccess}
    */
   public JPAEdmMappingModelAccess getJPAEdmMappingModelAccess(ODataJPAContext oDataJPAContext);
 }

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/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 ea9378f..52d45ab 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
@@ -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.factory;
 
@@ -30,15 +30,13 @@ import org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStateme
  * <p>
  * <ul>
  * <li>JPQL statement builders of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder}
- * </li>
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder} </li>
  * <li>JPQL context builder of type
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
- * </li>
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder} </li>
  * </ul>
  * </p>
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
  */
 public interface JPQLBuilderFactory {
@@ -46,10 +44,9 @@ public interface JPQLBuilderFactory {
    * The method returns JPQL statement builder for building JPQL statements.
    * 
    * @param context
-   *            is
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext}
-   *            that determines the type of JPQL statement builder. The
-   *            parameter cannot be null.
+   * is {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext} that determines the type of JPQL statement
+   * builder. The
+   * parameter cannot be null.
    * @return an instance of JPQLStatementBuilder
    */
   public JPQLStatementBuilder getStatementBuilder(JPQLContextView context);
@@ -59,10 +56,9 @@ public interface JPQLBuilderFactory {
    * object.
    * 
    * @param contextType
-   *            is
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
-   *            that determines the type of JPQL context builder. The
-   *            parameter cannot be null.
+   * is {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} that determines the type of JPQL context
+   * builder. The
+   * parameter cannot be null.
    * @return an instance of JPQLContextBuilder
    */
   public JPQLContextBuilder getContextBuilder(JPQLContextType contextType);
@@ -72,10 +68,9 @@ public interface JPQLBuilderFactory {
    * context object.
    * 
    * @param contextType
-   *            is
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
-   *            that determines the type of JPQL context builder. The
-   *            parameter cannot be null.
+   * is {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} that determines the type of JPQL context
+   * builder. The
+   * parameter cannot be null.
    * @return an instance of JPAMethodContextBuilder
    */
   public JPAMethodContextBuilder getJPAMethodContextBuilder(JPQLContextType contextType);

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/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 c0cf390..3d8073e 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
@@ -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.factory;
 
@@ -30,16 +30,13 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAMessageServi
  * 
  * <p>
  * <ul>
- * <li>OData JPA Processor of type
- * {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor}</li>
- * <li>JPA EDM Provider of type
- * {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider}</li>
- * <li>OData JPA Context
- * {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}</li>
+ * <li>OData JPA Processor of type {@link org.apache.olingo.odata2.api.processor.ODataSingleProcessor}</li>
+ * <li>JPA EDM Provider of type {@link org.apache.olingo.odata2.api.edm.provider.EdmProvider}</li>
+ * <li>OData JPA Context {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}</li>
  * </ul>
  * </p>
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory
  */
 public interface ODataJPAAccessFactory {
@@ -48,9 +45,8 @@ public interface ODataJPAAccessFactory {
    * behavior of an OData service.
    * 
    * @param oDataJPAContext
-   *            an instance of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
-   *            The context should be initialized properly and cannot be null.
+   * an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
+   * The context should be initialized properly and cannot be null.
    * @return An implementation of OData JPA Processor.
    */
   public ODataSingleProcessor createODataProcessor(ODataJPAContext oDataJPAContext);
@@ -58,11 +54,10 @@ public interface ODataJPAAccessFactory {
   /**
    * 
    * @param oDataJPAContext
-   *            an instance of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
-   *            The context should be initialized properly and cannot be null.
+   * an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.ODataJPAContext}.
+   * The context should be initialized properly and cannot be null.
    * @return An implementation of JPA EdmProvider. EdmProvider handles
-   *         meta-data.
+   * meta-data.
    */
   public EdmProvider createJPAEdmProvider(ODataJPAContext oDataJPAContext);
 
@@ -70,8 +65,7 @@ public interface ODataJPAAccessFactory {
    * The method creates an instance of OData JPA Context. An empty instance is
    * returned.
    * 
-   * @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}
    */
   public ODataJPAContext createODataJPAContext();
 
@@ -80,10 +74,9 @@ public interface ODataJPAAccessFactory {
    * dependent message text.
    * 
    * @param locale
-   *            is the language in which the message service should load
-   *            message texts.
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAMessageService}
+   * is the language in which the message service should load
+   * message texts.
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPAMessageService}
    */
   public ODataJPAMessageService getODataJPAMessageService(Locale locale);
 }

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/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 6888ec8..b421ce4 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
@@ -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.factory;
 
@@ -32,14 +32,15 @@ package org.apache.olingo.odata2.processor.api.jpa.factory;
  * factory implementation.
  * <p>
  * 
- *  
+ * 
  * 
  * 
  * 
  */
 public abstract class ODataJPAFactory {
 
-  private static final String IMPLEMENTATION = "org.apache.olingo.odata2.processor.core.jpa.factory.ODataJPAFactoryImpl";
+  private static final String IMPLEMENTATION =
+      "org.apache.olingo.odata2.processor.core.jpa.factory.ODataJPAFactoryImpl";
   private static ODataJPAFactory factoryImpl;
 
   /**
@@ -47,9 +48,7 @@ public abstract class ODataJPAFactory {
    * The instance of this factory can be used for creating other factory
    * implementations.
    * 
-   * @return instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory}
-   *         .
+   * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory} .
    */
   public static ODataJPAFactory createFactory() {
 
@@ -75,8 +74,7 @@ public abstract class ODataJPAFactory {
    * this method to return an implementation of JPQLBuilderFactory if default
    * implementation from library is not required.
    * 
-   * @return instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
+   * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
    */
   public JPQLBuilderFactory getJPQLBuilderFactory() {
     return null;
@@ -87,8 +85,7 @@ public abstract class ODataJPAFactory {
    * method to return an implementation of JPAAccessFactory if default
    * implementation from library is not required.
    * 
-   * @return instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
+   * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory}
    */
   public JPAAccessFactory getJPAAccessFactory() {
     return null;
@@ -99,8 +96,7 @@ public abstract class ODataJPAFactory {
    * this method to return an implementation of ODataJPAAccessFactory if
    * default implementation from library is not required.
    * 
-   * @return instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAAccessFactory}
+   * @return instance of type {@link org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAAccessFactory}
    */
   public ODataJPAAccessFactory getODataJPAAccessFactory() {
     return 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/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 5de70c9..de2b699 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
@@ -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.
  ******************************************************************************/
 /**
  * <h3>OData JPA Processor API Library - Factory</h3>
@@ -27,7 +27,7 @@
  * 
  * The instances of these factories can be obtained from an abstract ODataJPAFactory.
  * 
- *  
+ * 
  */
 package org.apache.olingo.odata2.processor.api.jpa.factory;
 

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/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 e0f7a55..ab24e67 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
@@ -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.jpql;
 
@@ -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.
  * 
- *  
+ * 
  * @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
@@ -57,7 +57,7 @@ public abstract class JPQLContext implements JPQLContextView {
    * sets JPA Entity Name into the context
    * 
    * @param jpaEntityName
-   *            is the name of JPA Entity
+   * is the name of JPA Entity
    */
   protected final void setJPAEntityName(final String jpaEntityName) {
     this.jpaEntityName = jpaEntityName;
@@ -67,7 +67,7 @@ public abstract class JPQLContext implements JPQLContextView {
    * sets JPA Entity alias name into the context
    * 
    * @param jpaEntityAlias
-   *            is the JPA entity alias name
+   * is the JPA entity alias name
    */
   protected final void setJPAEntityAlias(final String jpaEntityAlias) {
     this.jpaEntityAlias = jpaEntityAlias;
@@ -85,7 +85,7 @@ public abstract class JPQLContext implements JPQLContextView {
    * sets the JPQL context type into the context
    * 
    * @param type
-   *            is JPQLContextType
+   * is JPQLContextType
    */
   protected final void setType(final JPQLContextType type) {
     this.type = type;
@@ -109,19 +109,19 @@ public abstract class JPQLContext implements JPQLContextView {
 
   /**
    * the method returns an instance of type
-   * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
-   * based on the JPQLContextType. The context builder can be used for
+   * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder} based on the
+   * JPQLContextType. The context builder can be used for
    * building different JPQL contexts.
    * 
    * @param contextType
-   *            is the JPQLContextType
+   * is the JPQLContextType
    * @param resultsView
-   *            is the OData request view
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
+   * is the OData request view
+   * @return an instance of type {@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);
   }
 
@@ -129,7 +129,7 @@ public abstract class JPQLContext implements JPQLContextView {
    * The abstract class is extended by specific JPQLContext builder for
    * building JPQLContexts.
    * 
-   *  
+   * 
    * 
    */
   public static abstract class JPQLContextBuilder {
@@ -146,15 +146,17 @@ public abstract class JPQLContext implements JPQLContextView {
      * the method instantiates an instance of type JPQLContextBuilder.
      * 
      * @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 an instance of type
-     *         {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext.JPQLContextBuilder}
+     * {@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);
       }
@@ -167,8 +169,7 @@ public abstract class JPQLContext implements JPQLContextView {
      * to build JPQL Contexts. The build method makes use of information set
      * into the context to built JPQL Context Types.
      * 
-     * @return an instance of
-     *         {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext}
+     * @return an instance of {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContext}
      * @throws ODataJPAModelException
      * @throws ODataJPARuntimeException
      */
@@ -179,7 +180,7 @@ public abstract class JPQLContext implements JPQLContextView {
      * The method sets the OData request view into the JPQL context.
      * 
      * @param resultsView
-     *            is an instance representing OData request.
+     * is an instance representing OData request.
      */
     protected abstract void setResultsView(Object resultsView);
 

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/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 d1a0590..17df83a 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
@@ -1,27 +1,27 @@
 /*******************************************************************************
  * 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.jpql;
 
 /**
  * Enumerated list of JPQL context Types.
  * 
- *  
+ * 
  * 
  */
 public enum JPQLContextType {

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/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 1cd0071..d1ac24f 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
@@ -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.jpql;
 
@@ -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.
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType
  */
@@ -47,8 +47,7 @@ public interface JPQLContextView {
   /**
    * The method returns a JPQL context type
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType}
    */
   public JPQLContextType getType();
 }

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/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 176b093..4392015 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
@@ -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.jpql;
 
@@ -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.
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectContextView
  * 
  */
@@ -38,8 +38,7 @@ public interface JPQLJoinContextView extends JPQLSelectContextView {
    * The method returns a list of JPA Join Clauses. The returned list of
    * values can be used for building JPQL Statements with Join clauses.
    * 
-   * @return a list of
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
+   * @return a list of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
    */
   public List<JPAJoinClause> getJPAJoinClauses();
 }

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/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 1799772..7d71dc3 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
@@ -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.jpql;
 
@@ -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.
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLSelectSingleContextView
  * 
  */
@@ -39,8 +39,7 @@ public interface JPQLJoinSelectSingleContextView extends JPQLSelectSingleContext
    * The method returns a list of JPA Join Clauses. The returned list of
    * values can be used for building JPQL Statements with Join clauses.
    * 
-   * @return a list of
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
+   * @return a list of {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAJoinClause}
    */
   public abstract List<JPAJoinClause> getJPAJoinClauses();
 }

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/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 729a095..58f595e 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
@@ -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.jpql;
 
@@ -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.
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
  * 
  */

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/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 9222943..5e492be 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
@@ -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.jpql;
 
@@ -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.
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement
  * 
  */

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/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 6ac545b..e68b4d4 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
@@ -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.jpql;
 
@@ -22,15 +22,14 @@ import org.apache.olingo.odata2.processor.api.jpa.exception.ODataJPARuntimeExcep
 import org.apache.olingo.odata2.processor.api.jpa.factory.ODataJPAFactory;
 
 /**
- * The class represents a Java Persistence Query Language (JPQL) Statement. 
- * The JPQL statement is built using a builder namely 
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder}
- * . Based upon the JPQL Context types (
- * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} different
- * kinds of JPQL statements are built. 
+ * The class represents a Java Persistence Query Language (JPQL) Statement.
+ * The JPQL statement is built using a builder namely
+ * {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement.JPQLStatementBuilder} . Based upon the JPQL
+ * Context types ( {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextType} different
+ * kinds of JPQL statements are built.
  * The JPQL statements thus generated can be executed using JPA Query APIs to fetch JPA entities.
  * 
- *  
+ * 
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPQLBuilderFactory
  * @see org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView
  */
@@ -44,10 +43,9 @@ public class JPQLStatement {
    * upon the JPQL Context.
    * 
    * @param context
-   *            a non null value of
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView}
-   *            . The context is expected to be set to be built with no
-   *            errors.
+   * a non null value of {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLContextView} . The context is
+   * expected to be set to be built with no
+   * errors.
    * @return an instance of JPQL statement builder
    * @throws ODataJPARuntimeException
    */
@@ -80,7 +78,7 @@ public class JPQLStatement {
    * A default statement builder for building each kind of JPQL statements is
    * provided by the library.
    * 
-   *  
+   * 
    * 
    */
   public static abstract class JPQLStatementBuilder {
@@ -99,10 +97,9 @@ public class JPQLStatement {
      * The abstract method is implemented by specific statement builder for
      * building JPQL Statement.
      * 
-     * @return an instance of
-     *         {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement}
+     * @return an instance of {@link org.apache.olingo.odata2.processor.api.jpa.jpql.JPQLStatement}
      * @throws ODataJPARuntimeException
-     *             in case there are errors building the statements
+     * in case there are errors building the statements
      */
     public abstract JPQLStatement build() 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/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 e385c23..dc02b90 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
@@ -1,27 +1,27 @@
 /*******************************************************************************
  * 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 Query Language</h3>
  * 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.
  * 
- *  
+ * 
  */
 package org.apache.olingo.odata2.processor.api.jpa.jpql;
 

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/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 7ac6b90..9d3238d 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
@@ -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.model;
 
@@ -40,18 +40,16 @@ public interface JPAEdmAssociationEndView extends JPAEdmBaseView {
   /**
    * The method gets the one of the association ends present in the container.
    * 
-   * @return one of the
-   *         {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
-   *         {@link org.apache.olingo.odata2.api.edm.provider.Association}
+   * @return one of the {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
+   * {@link org.apache.olingo.odata2.api.edm.provider.Association}
    */
   AssociationEnd getEdmAssociationEnd2();
 
   /**
    * The method gets the other association end present in the container.
    * 
-   * @return one of the
-   *         {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
-   *         {@link org.apache.olingo.odata2.api.edm.provider.Association}
+   * @return one of the {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} for an
+   * {@link org.apache.olingo.odata2.api.edm.provider.Association}
    */
   AssociationEnd getEdmAssociationEnd1();
 
@@ -68,20 +66,17 @@ public interface JPAEdmAssociationEndView extends JPAEdmBaseView {
    * </i>
    * 
    * @param end1
-   *            one end of type
-   *            {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
-   *            an {@link org.apache.olingo.odata2.api.edm.provider.Association}
+   * one end of type {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
+   * an {@link org.apache.olingo.odata2.api.edm.provider.Association}
    * @param end2
-   *            other end of type
-   *            {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
-   *            an {@link org.apache.olingo.odata2.api.edm.provider.Association}
-   *            <p>
+   * other end of type {@link org.apache.olingo.odata2.api.edm.provider.AssociationEnd} of
+   * an {@link org.apache.olingo.odata2.api.edm.provider.Association} <p>
    * @return <ul>
-   *         <li><i>true</i> - Only if the properties of <b>end1</b> matches
-   *         with all the properties of any one end and only if the properties
-   *         of <b>end2</b> matches with all the properties of the remaining
-   *         end</li> <li><i>false</i> - Otherwise</li>
-   *         </ul>
+   * <li><i>true</i> - Only if the properties of <b>end1</b> matches
+   * with all the properties of any one end and only if the properties
+   * of <b>end2</b> matches with all the properties of the remaining
+   * end</li> <li><i>false</i> - Otherwise</li>
+   * </ul>
    */
   boolean compare(AssociationEnd end1, AssociationEnd end2);
 

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/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 832480c..911569d 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
@@ -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.model;
 
@@ -34,8 +34,8 @@ import org.apache.olingo.odata2.api.edm.provider.AssociationSet;
  * container for list of association sets that are consistent.
  * </p>
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
  */

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/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 678115a..7cc7cda 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
@@ -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.model;
 
@@ -40,8 +40,8 @@ import org.apache.olingo.odata2.api.edm.provider.Association;
  * </ol>
  * </p>
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView
@@ -61,36 +61,32 @@ public interface JPAEdmAssociationView extends JPAEdmBaseView {
    * set to be consistent only if all its mandatory properties can be
    * completely built from a Java Persistence Relationship.
    * 
-   * @return a consistent list of
-   *         {@link org.apache.olingo.odata2.api.edm.provider.Association}
+   * @return a consistent list of {@link org.apache.olingo.odata2.api.edm.provider.Association}
    * 
    */
   public List<Association> getConsistentEdmAssociationList();
 
   /**
-   * The method adds
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
-   * to its container
+   * The method adds {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView} to its container
    * 
    * @param associationView
-   *            of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+   * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
    */
-  public void addJPAEdmAssociationView(JPAEdmAssociationView associationView, JPAEdmAssociationEndView associationEndView);
+  public void addJPAEdmAssociationView(JPAEdmAssociationView associationView,
+      JPAEdmAssociationEndView associationEndView);
 
   /**
    * The method searches for an Association in its container against the
-   * search parameter <b>view</b> of type
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}.
+   * search parameter <b>view</b> of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+   * .
    * 
    * The Association in the container <b>view</b> is searched against the
    * consistent list of Association stored in this container.
    * 
    * @param view
-   *            of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+   * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
    * @return {@link org.apache.olingo.odata2.api.edm.provider.Association} if found
-   *         in the container
+   * in the container
    */
   public Association searchAssociation(JPAEdmAssociationEndView view);
 
@@ -101,8 +97,7 @@ public interface JPAEdmAssociationView extends JPAEdmBaseView {
    * </p>
    * 
    * @param refView
-   *            of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
+   * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
    */
   public void addJPAEdmRefConstraintView(JPAEdmReferentialConstraintView refView);
 
@@ -111,23 +106,22 @@ public interface JPAEdmAssociationView extends JPAEdmBaseView {
    * being processed.
    * 
    * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
+   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView}
    */
   public JPAEdmReferentialConstraintView getJPAEdmReferentialConstraintView();
 
   /**
    * The method searches for the number of associations with similar endpoints in its container against the
-   * search parameter <b>view</b> of type
-   * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}.
+   * search parameter <b>view</b> of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+   * .
    * 
    * The Association in the container <b>view</b> is searched against the
    * consistent list of Association stored in this container.
    * 
    * @param view
-   *            of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+   * of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
    * @return {@link org.apache.olingo.odata2.api.edm.provider.Association} if found
-   *         in the container
+   * in the container
    */
   int getNumberOfAssociationsWithSimilarEndPoints(JPAEdmAssociationEndView view);