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

[48/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/model/JPAEdmBaseView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
index 1f8370f..5687475 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmBaseView.java
@@ -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;
 
@@ -31,8 +31,8 @@ import org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmMappingModelAcces
  * The implementation of the view acts as a base container for containers of
  * Java Persistence Model and Entity Data Model elements.
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * 
  */
@@ -46,8 +46,7 @@ public interface JPAEdmBaseView {
   /**
    * The method returns the Java Persistence MetaModel
    * 
-   * @return a meta model of type
-   *         {@link javax.persistence.metamodel.Metamodel}
+   * @return a meta model of type {@link javax.persistence.metamodel.Metamodel}
    */
   public Metamodel getJPAMetaModel();
 
@@ -55,8 +54,7 @@ public interface JPAEdmBaseView {
    * The method returns a builder for building Entity Data Model elements from
    * Java Persistence Model Elements
    * 
-   * @return a builder of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}
+   * @return a builder of type {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}
    */
   public JPAEdmBuilder getBuilder();
 
@@ -64,8 +62,8 @@ public interface JPAEdmBaseView {
    * The method returns the if the container is consistent without any errors
    * 
    * @return <ul>
-   *         <li>true - if the container is consistent without errors</li>
-   *         <li>false - if the container is inconsistent with errors</li>
+   * <li>true - if the container is consistent without errors</li>
+   * <li>false - if the container is inconsistent with errors</li>
    * 
    */
   public boolean isConsistent();

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/JPAEdmComplexPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
index cd7f250..172e5f4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexPropertyView.java
@@ -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;
 
@@ -32,15 +32,14 @@ import org.apache.olingo.odata2.api.edm.provider.ComplexProperty;
  * container for the properties of EDM complex type.
  * </p>
  * 
- * @org.apache.olingo.odata2.DoNotImplement 
+ * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView
  */
 public interface JPAEdmComplexPropertyView extends JPAEdmBaseView {
   /**
    * The method returns a complex property for a complex type.
    * 
-   * @return an instance of
-   *         {@link org.apache.olingo.odata2.api.edm.provider.ComplexProperty}
+   * @return an instance of {@link org.apache.olingo.odata2.api.edm.provider.ComplexProperty}
    */
   ComplexProperty getEdmComplexProperty();
 }

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/JPAEdmComplexTypeView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
index 2b40ba0..bbee5e4 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmComplexTypeView.java
@@ -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;
 
@@ -39,8 +39,8 @@ import org.apache.olingo.odata2.api.edm.provider.Property;
  * complex types. An EDM complex type is said to be consistent only if it used
  * in at least one of the EDM entity type.
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexPropertyView
  * 
@@ -50,8 +50,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
   /**
    * The method returns an EDM complex type that is currently being processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.ComplexType}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.ComplexType}
    */
   public ComplexType getEdmComplexType();
 
@@ -59,8 +58,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
    * The method returns an JPA embeddable type that is currently being
    * processed.
    * 
-   * @return an instance of type
-   *         {@link javax.persistence.metamodel.EmbeddableType}
+   * @return an instance of type {@link javax.persistence.metamodel.EmbeddableType}
    */
   public javax.persistence.metamodel.EmbeddableType<?> getJPAEmbeddableType();
 
@@ -76,7 +74,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
    * the given JPA embeddable type name.
    * 
    * @param embeddableTypeName
-   *            is the name of JPA embeddable type
+   * is the name of JPA embeddable type
    * @return a reference to EDM complex type if found else null
    */
   public ComplexType searchEdmComplexType(String embeddableTypeName);
@@ -85,8 +83,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
    * The method add a JPA EDM complex type view to the container.
    * 
    * @param view
-   *            is an instance of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
+   * is an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
    */
   public void addJPAEdmCompleTypeView(JPAEdmComplexTypeView view);
 
@@ -95,7 +92,7 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
    * the given EDM complex type's fully qualified name.
    * 
    * @param type
-   *            is the fully qualified name of EDM complex type
+   * is the fully qualified name of EDM complex type
    * @return a reference to EDM complex type if found else null
    */
   public ComplexType searchEdmComplexType(FullQualifiedName type);
@@ -105,14 +102,15 @@ public interface JPAEdmComplexTypeView extends JPAEdmBaseView {
    * properties.
    * 
    * @param complexType
-   *            is the EDM complex type to expand
+   * is the EDM complex type to expand
    * @param expandedPropertyList
-   *            is the list to be populated with expanded EDM simple
-   *            properties
+   * is the list to be populated with expanded EDM simple
+   * properties
    * @param embeddablePropertyName
-   *            is the name of the complex property. The name is used as the
-   *            qualifier for the expanded simple property names.
+   * is the name of the complex property. The name is used as the
+   * qualifier for the expanded simple property names.
    */
-  public void expandEdmComplexType(ComplexType complexType, List<Property> expandedPropertyList, String embeddablePropertyName);
+  public void expandEdmComplexType(ComplexType complexType, List<Property> expandedPropertyList,
+      String embeddablePropertyName);
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-olingo-odata2/blob/da6d5ca1/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
index 20af73a..82ccaf9 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityContainerView.java
@@ -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;
 
@@ -32,7 +32,7 @@ import org.apache.olingo.odata2.api.edm.provider.EntityContainer;
  * container is said to be consistent only if the JPA EDM association set and
  * JPA EDM Entity Set view are consistent.
  * 
- *  
+ * 
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView
@@ -43,8 +43,7 @@ public interface JPAEdmEntityContainerView extends JPAEdmBaseView {
    * The method returns the EDM entity container that is currently being
    * processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.EntityContainer}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityContainer}
    */
   public EntityContainer getEdmEntityContainer();
 
@@ -59,8 +58,7 @@ public interface JPAEdmEntityContainerView extends JPAEdmBaseView {
    * The method returns the JPA EDM entity set view that is currently being
    * processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntitySetView}
    */
   public JPAEdmEntitySetView getJPAEdmEntitySetView();
 
@@ -68,8 +66,7 @@ public interface JPAEdmEntityContainerView extends JPAEdmBaseView {
    * The method returns the JPA EDM association set view that is currently
    * being processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationSetView}
    */
   public JPAEdmAssociationSetView getEdmAssociationSetView();
 }

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/JPAEdmEntitySetView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
index 8068be9..87019f6 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntitySetView.java
@@ -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;
 
@@ -31,8 +31,8 @@ import org.apache.olingo.odata2.api.edm.provider.EntitySet;
  * of EDM entity sets. An EDM entity set is said to be consistent only if it has
  * consistent EDM entity types.
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView
  * 
@@ -41,8 +41,7 @@ public interface JPAEdmEntitySetView extends JPAEdmBaseView {
   /**
    * The method returns an EDM entity set that is currently being processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.EntitySet}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntitySet}
    */
   public EntitySet getEdmEntitySet();
 
@@ -58,8 +57,7 @@ public interface JPAEdmEntitySetView extends JPAEdmBaseView {
    * processed. JPA EDM entity set view is built from JPA EDM entity type
    * view.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
    */
   public JPAEdmEntityTypeView getJPAEdmEntityTypeView();
 

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/JPAEdmEntityTypeView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
index d8293d3..54965d8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmEntityTypeView.java
@@ -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;
 
@@ -31,8 +31,8 @@ import org.apache.olingo.odata2.api.edm.provider.EntityType;
  * entity types. An EDM entity type is said to be consistent only if it has at
  * least one consistent EDM property and at least one consistent EDM key.
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView
@@ -43,8 +43,7 @@ public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
   /**
    * The method returns an EDM entity currently being processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.EntityType}
    */
   public EntityType getEdmEntityType();
 
@@ -52,8 +51,7 @@ public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
    * The method returns java persistence Entity type currently being
    * processed.
    * 
-   * @return an instance of type
-   *         {@link javax.persistence.metamodel.EntityType}
+   * @return an instance of type {@link javax.persistence.metamodel.EntityType}
    */
   public javax.persistence.metamodel.EntityType<?> getJPAEntityType();
 
@@ -70,7 +68,7 @@ public interface JPAEdmEntityTypeView extends JPAEdmBaseView {
    * given EDM entity type's name.
    * 
    * @param jpaEntityTypeName
-   *            is the name of EDM entity type
+   * is the name of EDM entity type
    * @return a reference to EDM entity type if found else null
    */
   public EntityType searchEdmEntityType(String jpaEntityTypeName);

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/JPAEdmExtension.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
index 77d90a1..1345106 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmExtension.java
@@ -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.model;
 
 /**
  * The interface provides methods to extend JPA EDM containers.
  * 
- *  
+ * 
  * 
  */
 public interface JPAEdmExtension {
@@ -31,18 +31,18 @@ public interface JPAEdmExtension {
    * register custom operations.
    * 
    * @param view
-   *            is the schema view
-   * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView#registerOperations(Class,
-   *      String[])
+   * is the schema view
+   * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView#registerOperations(Class, String[])
    * 
    */
   public void extendWithOperation(JPAEdmSchemaView view);
 
   /**
-   * The method is used to extend the JPA EDM schema view with Entities, Entity Sets, Navigation Property and Association. 
+   * The method is used to extend the JPA EDM schema view with Entities, Entity Sets, Navigation Property and
+   * Association.
    * 
    * @param view
-   *            is the schema view
+   * is the schema view
    * 
    */
   public void extendJPAEdmSchema(JPAEdmSchemaView view);

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/JPAEdmFunctionImportView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
index 0eb1c14..be19742 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmFunctionImportView.java
@@ -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;
 
@@ -33,8 +33,8 @@ import org.apache.olingo.odata2.api.edm.provider.FunctionImport;
  * function imports that are consistent.
  * </p>
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * 
  */
@@ -45,8 +45,7 @@ public interface JPAEdmFunctionImportView extends JPAEdmBaseView {
    * import is said to be consistent only if it adheres to the rules defined
    * in CSDL.
    * 
-   * @return a list of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport}
+   * @return a list of type {@link org.apache.olingo.odata2.api.edm.provider.FunctionImport}
    */
   List<FunctionImport> getConsistentFunctionImportList();
 }

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/JPAEdmKeyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
index 205eecd..a684126 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmKeyView.java
@@ -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.Key;
  * given JPA EDM entity type. The view acts as a container for consistent EDM
  * key property of an EDM entity type.
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmPropertyView
  * 
@@ -45,8 +45,7 @@ public interface JPAEdmKeyView extends JPAEdmBaseView {
    * The method returns an instance of EDM key for the given JPA EDM Entity
    * type.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.Key}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.Key}
    */
   public Key getEdmKey();
 }

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/JPAEdmMapping.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
index 04bb102..4c44083 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmMapping.java
@@ -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;
 
@@ -23,7 +23,7 @@ package org.apache.olingo.odata2.processor.api.jpa.model;
  * JPA EDM mapping instance can be associated with any EDM simple, EDM complex
  * property to denote the properties Java persistence column name.
  * 
- *  
+ * 
  * 
  */
 public interface JPAEdmMapping {
@@ -32,7 +32,7 @@ public interface JPAEdmMapping {
    * container.
    * 
    * @param name
-   *            is the Java persistence column name
+   * is the Java persistence column name
    */
   public void setJPAColumnName(String name);
 
@@ -41,7 +41,7 @@ public interface JPAEdmMapping {
    * container.
    * 
    * @return a String representing the Java persistence column name set into
-   *         the container
+   * the container
    */
   public String getJPAColumnName();
 
@@ -49,7 +49,7 @@ public interface JPAEdmMapping {
    * The method sets the Java persistence entity/property type.
    * 
    * @param type
-   *            is an instance of type Class<?>
+   * is an instance of type Class<?>
    */
   public void setJPAType(Class<?> 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/model/JPAEdmModelView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
index 61040ed..4c9a777 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmModelView.java
@@ -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;
 
@@ -26,10 +26,9 @@ package org.apache.olingo.odata2.processor.api.jpa.model;
  * EDM meta model. The instance of JPA EDM meta model can be created using
  * {@link org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory}. The
  * instance thus obtained can be used for constructing other elements of the
- * meta model using
- * {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}.
+ * meta model using {@link org.apache.olingo.odata2.processor.api.jpa.access.JPAEdmBuilder}.
+ * 
  * 
- *  
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.factory.JPAAccessFactory
  */
@@ -38,8 +37,7 @@ public interface JPAEdmModelView extends JPAEdmBaseView {
    * The method returns a consistent JPA EDM schema view created from the JPA
    * meta model.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmSchemaView}
    */
   public JPAEdmSchemaView getEdmSchemaView();
 }

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/JPAEdmNavigationPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
index fd7731f..e1b0d3d 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmNavigationPropertyView.java
@@ -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;
 
@@ -38,7 +38,7 @@ import org.apache.olingo.odata2.api.edm.provider.NavigationProperty;
  * list of EDM navigation properties of an EDM entity type. EDM navigation
  * property is consistent only if there exists a consistent EDM association.
  * 
- *  
+ * 
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
  * 
@@ -48,8 +48,7 @@ public interface JPAEdmNavigationPropertyView extends JPAEdmBaseView {
    * The method adds a navigation property view to its container.
    * 
    * @param view
-   *            is an instance of type
-   *            {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
+   * is an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
    */
   void addJPAEdmNavigationPropertyView(JPAEdmNavigationPropertyView view);
 
@@ -66,8 +65,7 @@ public interface JPAEdmNavigationPropertyView extends JPAEdmBaseView {
    * The method returns the navigation property that is currently being
    * processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.NavigationProperty}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.NavigationProperty}
    */
   NavigationProperty getEdmNavigationProperty();
 

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/JPAEdmPropertyView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
index 17c8bdc..742d5c8 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmPropertyView.java
@@ -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;
 
@@ -42,8 +42,8 @@ import org.apache.olingo.odata2.api.edm.provider.SimpleProperty;
  * exists at least one property in the entity type and there is at least one key
  * property.
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView
@@ -53,16 +53,14 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
   /**
    * The method returns a simple EDM property.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.SimpleProperty}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.SimpleProperty}
    */
   SimpleProperty getEdmSimpleProperty();
 
   /**
    * The method returns a JPA EDM key view.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmKeyView}
    */
   JPAEdmKeyView getJPAEdmKeyView();
 
@@ -77,15 +75,14 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
    * The method returns a JPA Attribute for the given JPA entity type.
    * 
    * @return an instance of type {@link javax.persistence.metamodel.Attribute
-   *         <?, ?>}
+   * <?, ?>}
    */
   Attribute<?, ?> getJPAAttribute();
 
   /**
    * The method returns a JPA EDM navigation property view.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmNavigationPropertyView}
    */
   JPAEdmNavigationPropertyView getJPAEdmNavigationPropertyView();
 
@@ -93,8 +90,7 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
    * The method returns a JPA EDM Entity Type view that holds the property
    * view.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityTypeView}
    */
   JPAEdmEntityTypeView getJPAEdmEntityTypeView();
 
@@ -102,8 +98,7 @@ public interface JPAEdmPropertyView extends JPAEdmBaseView {
    * The method returns a JPA EDM Complex Type view that holds the property
    * view.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
    */
   JPAEdmComplexTypeView getJPAEdmComplexTypeView();
 }

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/JPAEdmReferentialConstraintRoleView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
index ee8a3be..ebf945c 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintRoleView.java
@@ -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;
 
@@ -36,8 +36,8 @@ import org.apache.olingo.odata2.api.edm.provider.ReferentialConstraintRole;
  * can be created from JPA Entity relationships.
  * </p>
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintView
  * 
@@ -53,8 +53,7 @@ public interface JPAEdmReferentialConstraintRoleView extends JPAEdmBaseView {
   /**
    * The method returns the role type (PRINCIPAL or DEPENDENT)
    * 
-   * @return a
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView.RoleType}
+   * @return a {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView.RoleType}
    */
   RoleType getRoleType();
 
@@ -62,8 +61,7 @@ public interface JPAEdmReferentialConstraintRoleView extends JPAEdmBaseView {
    * The method returns the Referential constraint role that is currently
    * being processed.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraintRole}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraintRole}
    */
   ReferentialConstraintRole getEdmReferentialConstraintRole();
 

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/JPAEdmReferentialConstraintView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
index f6215e8..4b90edb 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmReferentialConstraintView.java
@@ -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;
 
@@ -33,7 +33,7 @@ import org.apache.olingo.odata2.api.edm.provider.ReferentialConstraint;
  * to be consistent only if referential constraint role is consistent.
  * </p>
  * 
- *  <br>
+ * <br>
  * @org.apache.olingo.odata2.DoNotImplement
  * <br>
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmReferentialConstraintRoleView
@@ -45,8 +45,7 @@ public interface JPAEdmReferentialConstraintView extends JPAEdmBaseView {
    * The method returns EDM referential constraint created from Java
    * persistence Entity Join Columns.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraint}
+   * @return an instance of type {@link org.apache.olingo.odata2.api.edm.provider.ReferentialConstraint}
    */
   public ReferentialConstraint getEdmReferentialConstraint();
 

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/JPAEdmSchemaView.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
index cfe19e8..d52d9a3 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/JPAEdmSchemaView.java
@@ -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,14 +34,13 @@ import org.apache.olingo.odata2.api.edm.provider.Schema;
  * schema is consistent only if following elements are consistent
  * <ol>
  * <li>{@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}</li>
- * <li>
- * {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}</li>
+ * <li> {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}</li>
  * <li>{@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}</li>
  * </ol>
  * </p>
  * 
- *  
- *         <p>
+ * 
+ * <p>
  * @org.apache.olingo.odata2.DoNotImplement
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView
  * @see org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView
@@ -52,8 +51,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
   /**
    * The method returns the EDM schema present in the container.
    * 
-   * @return an instance EDM schema of type
-   *         {@link org.apache.olingo.odata2.api.edm.provider.Schema}
+   * @return an instance EDM schema of type {@link org.apache.olingo.odata2.api.edm.provider.Schema}
    */
   public Schema getEdmSchema();
 
@@ -61,8 +59,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
    * The method returns JPA EDM container view. The JPA EDM container view can
    * be used to access EDM Entity Container elements.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmEntityContainerView}
    */
   public JPAEdmEntityContainerView getJPAEdmEntityContainerView();
 
@@ -70,8 +67,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
    * The method returns JPA EDM complex view. The JPA EDM complex view can be
    * used to access EDM complex types and JPA Embeddable Types.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmComplexTypeView}
    */
   public JPAEdmComplexTypeView getJPAEdmComplexTypeView();
 
@@ -79,8 +75,7 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
    * The method returns JPA EDM association view. The JPA EDM association view
    * can be used to access EDM associations and JPA Relationships.
    * 
-   * @return an instance of type
-   *         {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
+   * @return an instance of type {@link org.apache.olingo.odata2.processor.api.jpa.model.JPAEdmAssociationView}
    */
   public JPAEdmAssociationView getJPAEdmAssociationView();
 
@@ -96,12 +91,12 @@ public interface JPAEdmSchemaView extends JPAEdmBaseView {
    * The method is a callback.
    * 
    * @param customClass
-   *            is the class that contains custom operations
+   * is the class that contains custom operations
    * @param methodNames
-   *            is the name of the method that needs to be transformed into
-   *            Function Imports. It is an optional parameter. If null is
-   *            passed then all annotated methods are transformed into
-   *            Function Imports.
+   * is the name of the method that needs to be transformed into
+   * Function Imports. It is an optional parameter. If null is
+   * passed then all annotated methods are transformed into
+   * Function Imports.
    * 
    */
   public void registerOperations(Class<?> customClass, String methodNames[]);

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/mapping/JPAAttributeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
index 20cb3c7..7c9278f 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAAttributeMapType.java
@@ -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.mapping;
 
@@ -30,11 +30,11 @@ import javax.xml.bind.annotation.XmlValue;
 
 /**
  * 
- * 				The default name for EDM
- * 				property is derived from JPA attribute name. This can be overriden
- * 				using
- * 				JPAAttributeMapType.
- * 			
+ * The default name for EDM
+ * property is derived from JPA attribute name. This can be overriden
+ * using
+ * JPAAttributeMapType.
+ * 
  * 
  * <p>Java class for JPAAttributeMapType complex type.
  * 
@@ -42,22 +42,22 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  * <pre>
  * &lt;complexType name="JPAAttributeMapType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="JPAAttribute" maxOccurs="unbounded" minOccurs="0">
- *           &lt;complexType>
- *             &lt;simpleContent>
- *               &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
- *                 &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 &lt;attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *               &lt;/extension>
- *             &lt;/simpleContent>
- *           &lt;/complexType>
- *         &lt;/element>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element name="JPAAttribute" maxOccurs="unbounded" minOccurs="0">
+ * &lt;complexType>
+ * &lt;simpleContent>
+ * &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ * &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * &lt;attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * &lt;/extension>
+ * &lt;/simpleContent>
+ * &lt;/complexType>
+ * &lt;/element>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
  * 
@@ -82,13 +82,12 @@ public class JPAAttributeMapType {
    * <p>
    * For example, to add a new item, do as follows:
    * <pre>
-   *    getJPAAttribute().add(newItem);
+   * getJPAAttribute().add(newItem);
    * </pre>
    * 
    * 
    * <p>
-   * Objects of the following type(s) are allowed in the list
-   * {@link JPAAttributeMapType.JPAAttribute }
+   * Objects of the following type(s) are allowed in the list {@link JPAAttributeMapType.JPAAttribute }
    * 
    * 
    */
@@ -106,12 +105,12 @@ public class JPAAttributeMapType {
    * 
    * <pre>
    * &lt;complexType>
-   *   &lt;simpleContent>
-   *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
-   *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-   *       &lt;attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-   *     &lt;/extension>
-   *   &lt;/simpleContent>
+   * &lt;simpleContent>
+   * &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+   * &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+   * &lt;attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+   * &lt;/extension>
+   * &lt;/simpleContent>
    * &lt;/complexType>
    * </pre>
    * 
@@ -132,9 +131,8 @@ public class JPAAttributeMapType {
      * Gets the value of the value property.
      * 
      * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * possible object is {@link String }
+     * 
      */
     public String getValue() {
       return value;
@@ -144,9 +142,8 @@ public class JPAAttributeMapType {
      * Sets the value of the value property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * allowed object is {@link String }
+     * 
      */
     public void setValue(final String value) {
       this.value = value;
@@ -156,9 +153,8 @@ public class JPAAttributeMapType {
      * Gets the value of the name property.
      * 
      * @return
-     *     possible object is
-     *     {@link String }
-     *     
+     * possible object is {@link String }
+     * 
      */
     public String getName() {
       return name;
@@ -168,9 +164,8 @@ public class JPAAttributeMapType {
      * Sets the value of the name property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
+     * allowed object is {@link String }
+     * 
      */
     public void setName(final String value) {
       name = value;
@@ -180,9 +175,8 @@ public class JPAAttributeMapType {
      * Gets the value of the exclude property.
      * 
      * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
+     * possible object is {@link Boolean }
+     * 
      */
     public boolean isExclude() {
       if (exclude == null) {
@@ -196,9 +190,8 @@ public class JPAAttributeMapType {
      * Sets the value of the exclude property.
      * 
      * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
+     * allowed object is {@link Boolean }
+     * 
      */
     public void setExclude(final Boolean value) {
       exclude = value;

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/mapping/JPAEdmMappingModel.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java
index dbb2d54..a91f12a 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModel.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.mapping;
 
@@ -34,13 +34,14 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <pre>
  * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="PersistenceUnit" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAPersistenceUnitMapType"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element name="PersistenceUnit"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAPersistenceUnitMapType"/>
+ * &lt;/sequence>
+ * &lt;/restriction>
+ * &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
  * 
@@ -68,7 +69,7 @@ public class JPAEdmMappingModel {
    * Sets the value of the persistenceUnit property.
    * 
    * @param value
-   *            allowed object is {@link JPAPersistenceUnitMapType }
+   * allowed object is {@link JPAPersistenceUnitMapType }
    * 
    */
   public void setPersistenceUnit(final JPAPersistenceUnitMapType value) {

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/mapping/JPAEdmMappingModelFactory.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java
index 3cc8681..f0e9787 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEdmMappingModelFactory.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.mapping;
 

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/mapping/JPAEmbeddableTypeMapType.java
----------------------------------------------------------------------
diff --git a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
index 2e8a01a..f462a96 100644
--- a/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
+++ b/jpa-api/src/main/java/org/apache/olingo/odata2/processor/api/jpa/model/mapping/JPAEmbeddableTypeMapType.java
@@ -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.mapping;
 
@@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlType;
 
 /**
  * 
- * 				The default name for EDM
- * 				complex type is derived from JPA Embeddable type name. This can be
- * 				overriden using JPAEmbeddableTypeMapType.
- * 			
+ * The default name for EDM
+ * complex type is derived from JPA Embeddable type name. This can be
+ * overriden using JPAEmbeddableTypeMapType.
+ * 
  * 
  * <p>Java class for JPAEmbeddableTypeMapType complex type.
  * 
@@ -37,16 +37,17 @@ import javax.xml.bind.annotation.XmlType;
  * 
  * <pre>
  * &lt;complexType name="JPAEmbeddableTypeMapType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="EDMComplexType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *         &lt;element name="JPAAttributes" type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAAttributeMapType"/>
- *       &lt;/sequence>
- *       &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
+ * &lt;complexContent>
+ * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * &lt;sequence>
+ * &lt;element name="EDMComplexType" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ * &lt;element name="JPAAttributes"
+ * type="{http://www.apache.org/olingo/odata2/processor/api/jpa/model/mapping}JPAAttributeMapType"/>
+ * &lt;/sequence>
+ * &lt;attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * &lt;attribute name="exclude" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
+ * &lt;/restriction>
+ * &lt;/complexContent>
  * &lt;/complexType>
  * </pre>
  * 
@@ -69,9 +70,8 @@ public class JPAEmbeddableTypeMapType {
    * Gets the value of the edmComplexType property.
    * 
    * @return
-   *     possible object is
-   *     {@link String }
-   *     
+   * possible object is {@link String }
+   * 
    */
   public String getEDMComplexType() {
     return edmComplexType;
@@ -81,9 +81,8 @@ public class JPAEmbeddableTypeMapType {
    * Sets the value of the edmComplexType property.
    * 
    * @param value
-   *     allowed object is
-   *     {@link String }
-   *     
+   * allowed object is {@link String }
+   * 
    */
   public void setEDMComplexType(final String value) {
     edmComplexType = value;
@@ -93,9 +92,8 @@ public class JPAEmbeddableTypeMapType {
    * Gets the value of the jpaAttributes property.
    * 
    * @return
-   *     possible object is
-   *     {@link JPAAttributeMapType }
-   *     
+   * possible object is {@link JPAAttributeMapType }
+   * 
    */
   public JPAAttributeMapType getJPAAttributes() {
     return jpaAttributes;
@@ -105,9 +103,8 @@ public class JPAEmbeddableTypeMapType {
    * Sets the value of the jpaAttributes property.
    * 
    * @param value
-   *     allowed object is
-   *     {@link JPAAttributeMapType }
-   *     
+   * allowed object is {@link JPAAttributeMapType }
+   * 
    */
   public void setJPAAttributes(final JPAAttributeMapType value) {
     jpaAttributes = value;
@@ -117,9 +114,8 @@ public class JPAEmbeddableTypeMapType {
    * Gets the value of the name property.
    * 
    * @return
-   *     possible object is
-   *     {@link String }
-   *     
+   * possible object is {@link String }
+   * 
    */
   public String getName() {
     return name;
@@ -129,9 +125,8 @@ public class JPAEmbeddableTypeMapType {
    * Sets the value of the name property.
    * 
    * @param value
-   *     allowed object is
-   *     {@link String }
-   *     
+   * allowed object is {@link String }
+   * 
    */
   public void setName(final String value) {
     name = value;
@@ -141,9 +136,8 @@ public class JPAEmbeddableTypeMapType {
    * Gets the value of the exclude property.
    * 
    * @return
-   *     possible object is
-   *     {@link Boolean }
-   *     
+   * possible object is {@link Boolean }
+   * 
    */
   public boolean isExclude() {
     if (exclude == null) {
@@ -157,9 +151,8 @@ public class JPAEmbeddableTypeMapType {
    * Sets the value of the exclude property.
    * 
    * @param value
-   *     allowed object is
-   *     {@link Boolean }
-   *     
+   * allowed object is {@link Boolean }
+   * 
    */
   public void setExclude(final Boolean value) {
     exclude = value;