diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java index b7d3bcd78..94a9bf908 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/Edm.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/Edm.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; /** * Entity Data Model (EDM)

Interface representing a Entity Data Model as described in the Conceptual Schema diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java index adfa44ea8..b110c26cf 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAction.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * A CSDL action. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java index 4a203410c..fbf503e20 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmActionImport.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmActionImport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An EdmActionImport. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java index b676bb374..840090d5c 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotatable.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotatable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * EdmAnnotatable can be applied to CSDL elements as described in the Conceptual Schema Definition Language. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java index bbb3d4fb5..1e4f46cd6 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmAnnotations.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmAnnotations.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; //TODO: EDM Annotation Interfaces public interface EdmAnnotations { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java index 155ae196a..1ae6bf3ba 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmBindingTarget.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmBindingTarget.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * Entity Sets or Singletons can be bound to each other using a navigation property binding diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java index 0f4a11879..1ac50eabf 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmComplexType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmComplexType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** *

A CSDL ComplexType element.

diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java index f09184f73..627824e14 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmElement.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmElement.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An {@link EdmElement} can either be an {@link EdmNavigationProperty}, diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java index a522d45bf..dd8af3049 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityContainer.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityContainer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * A CSDL EntityContainer element @@ -57,5 +57,5 @@ public interface EdmEntityContainer extends EdmNamed { * @return {@link EdmFunctionImport} */ EdmFunctionImport getFunctionImport(String name); - + } \ No newline at end of file diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java index d59c38dd9..3eed41e8e 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntitySet.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * A CSDL EntitySet element diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java index a2ab352e2..6db838736 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEntityType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEntityType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java index 09eb12a4c..4e0daf906 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmEnumType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmEnumType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java index 17720899d..5a1223026 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmException.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; public class EdmException extends RuntimeException { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java index 793259deb..dbc5d36a6 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunction.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunction.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An EdmFunction as described in the OData specification diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java index 2b236ff14..fb561e165 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmFunctionImport.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmFunctionImport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java index 3ce5e63b1..23a63f723 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmKeyPropertyRef.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmKeyPropertyRef.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; public interface EdmKeyPropertyRef { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMember.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMember.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java index 5c86c28ef..f78904656 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmMember.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmMember.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An {@link EdmEnumType} member element diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmNamed.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmNamed.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java index 1a3e9824d..ec347d4ab 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmNamed.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNamed.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * EdmNamed is the base interface for nearly all CSDL constructs. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmNavigationProperty.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmNavigationProperty.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java index 826150e29..cb873002f 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmNavigationProperty.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmNavigationProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * A CSDL NavigationProperty element diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperation.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperation.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java index 82332b9eb..1266e6399 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperation.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java index c2beb8b1c..9f0c86229 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmOperationImport.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmOperationImport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An EdmOperationImport can be an EdmActionImport or an EdmFunctionImport. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmParameter.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java similarity index 92% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmParameter.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java index e1119f5b0..ef14e16a3 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmParameter.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmParameter.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; -import org.apache.olingo.commons.api.edm.helper.EdmMappable; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmMappable; /** * A CSDL parameter element diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java similarity index 99% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java index 9ad89f448..4746284d6 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** *

EdmPrimitiveType is a primitive type as defined in the Entity Data Model (EDM).

diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeException.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java index 3e1274dd1..f22f1b1ba 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmPrimitiveTypeException.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmPrimitiveTypeException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; public class EdmPrimitiveTypeException extends Exception { private static final long serialVersionUID = 1L; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmProperty.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmProperty.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java index 347badf4d..ce9ee5779 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmProperty.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmProperty.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; -import org.apache.olingo.commons.api.edm.helper.EdmMappable; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmMappable; /** * A CSDL Property element diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmReturnType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmReturnType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java index eb649dc4b..de2e7ba86 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmReturnType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmReturnType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An {@link EdmReturnType} of an {@link EdmOperation}. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmServiceMetadata.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java similarity index 87% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmServiceMetadata.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java index 104dad422..82c233d02 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmServiceMetadata.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmServiceMetadata.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; import java.io.InputStream; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.EdmEntitySetInfo; -import org.apache.olingo.commons.api.edm.helper.EdmFunctionImportInfo; -import org.apache.olingo.commons.api.edm.helper.EdmSingletonInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmEntitySetInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmFunctionImportInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmSingletonInfo; /** * This interface gives access to the metadata of a service, diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmSingleton.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmSingleton.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java index 872cc5a3e..b8e15c74f 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmSingleton.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmSingleton.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An {@link EdmSingleton} represents a single entity inside the entity model. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuralType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuralType.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuralType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuralType.java index 18d3b97f4..c9f5095db 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmStructuralType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmStructuralType.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTerm.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTerm.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java index b445601fd..29acf32ce 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTerm.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTerm.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An {@link EdmTerm} defines a term in a vocabulary. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java similarity index 91% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java index 9950e8e79..7c7a688e3 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmType.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; /** * EdmType holds the namespace of a given type and its type as {@link EdmTypeKind}. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTypeDefinition.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTypeDefinition.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java index 887b0ef7b..c56aef25e 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTypeDefinition.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTypeDefinition.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * An {@link EdmTypeDefinition} defines a specialization of one of the possible diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTyped.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTyped.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java index 2f25fb773..c71722f79 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/EdmTyped.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/EdmTyped.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm; +package org.apache.olingo.odata4.commons.api.edm; /** * EdmTyped indicates if an EDM element is of a special type and holds the multiplicity of that type. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmConcurrencyMode.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmConcurrencyMode.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmConcurrencyMode.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmConcurrencyMode.java index db24d505c..1e93686f4 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmConcurrencyMode.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmConcurrencyMode.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.constants; +package org.apache.olingo.odata4.commons.api.edm.constants; /** * EdmConcurrencyMode can be applied to any primitive Entity Data Model (EDM) type. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java index a22aedfb8..e0b000f53 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmOnDelete.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmOnDelete.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.constants; +package org.apache.olingo.odata4.commons.api.edm.constants; public enum EdmOnDelete { Cascade, None, SetNull, SetDefault; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTargetPath.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTargetPath.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java index d28f65c5d..4749433bc 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTargetPath.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTargetPath.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.constants; +package org.apache.olingo.odata4.commons.api.edm.constants; /** * EdmTargetPath specifies the possible default targets for an EDM property which is mapped to an atom element. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java index c4bcc5cf6..2573299a7 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/constants/EdmTypeKind.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/constants/EdmTypeKind.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.constants; +package org.apache.olingo.odata4.commons.api.edm.constants; /** * EdmTypeKind specifies the type of an EDM element. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/AliasInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/AliasInfo.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/AliasInfo.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/AliasInfo.java index 53210d3e6..b9b706d15 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/AliasInfo.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/AliasInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; public class AliasInfo { private String namespace; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmEntitySetInfo.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmEntitySetInfo.java index 8af3d7089..23b891d82 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmEntitySetInfo.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmEntitySetInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; import java.net.URI; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmFunctionImportInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmFunctionImportInfo.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmFunctionImportInfo.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmFunctionImportInfo.java index b92f80ced..56e5940b8 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmFunctionImportInfo.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmFunctionImportInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; import java.net.URI; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmMappable.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmMappable.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmMappable.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmMappable.java index 675994635..f19839f60 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmMappable.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmMappable.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; /** * EdmMappable can be applied to CSDL elements to associate additional information. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmMapping.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmMapping.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmMapping.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmMapping.java index 912d9828a..5a5f0fa55 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmMapping.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmMapping.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; /** * EdmMapping holds custom mapping information which can be applied to a CSDL element. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmSingletonInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmSingletonInfo.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmSingletonInfo.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmSingletonInfo.java index 61cbaa374..53a0470b0 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EdmSingletonInfo.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EdmSingletonInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; import java.net.URI; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EntityContainerInfo.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EntityContainerInfo.java index 8d534ba0d..185ae27ce 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/EntityContainerInfo.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/EntityContainerInfo.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; public class EntityContainerInfo { private FullQualifiedName containerName; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/FullQualifiedName.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/FullQualifiedName.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/FullQualifiedName.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/FullQualifiedName.java index 4946ce676..af1272a9a 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/helper/FullQualifiedName.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/helper/FullQualifiedName.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.helper; +package org.apache.olingo.odata4.commons.api.edm.helper; /** * A full qualified name of any element in the EDM consists of a name and a namespace. diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java index f9fb51aae..18b1a3f13 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/package-info.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/package-info.java @@ -24,4 +24,4 @@ *

Many classes and interfaces contain the pragma:" @org.apache.olingo.api.edm.DoNotImplement " * to indicate these classes should only be used and not implemented.

*/ -package org.apache.olingo.commons.api.edm; \ No newline at end of file +package org.apache.olingo.odata4.commons.api.edm; \ No newline at end of file diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Action.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Action.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Action.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Action.java index ee0b6a81d..8ab99ae3c 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Action.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Action.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ActionImport.java similarity index 91% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ActionImport.java index bbcc480f3..20e27727a 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ActionImport.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ActionImport.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class ActionImport extends OperationImport { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Annotation.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Annotation.java similarity index 93% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Annotation.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Annotation.java index cce8b2c5a..3440a176e 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Annotation.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Annotation.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO:finish public class Annotation { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/BindingTarget.java similarity index 93% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/BindingTarget.java index b79e5be3f..d2f3bbc6c 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/BindingTarget.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/BindingTarget.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public abstract class BindingTarget { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ComplexType.java similarity index 93% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ComplexType.java index b96254aa6..2188e512c 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ComplexType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ComplexType.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public class ComplexType extends StructuralType { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProvider.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProvider.java index 79d7f1e54..1f0bca71c 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProvider.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProvider.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.AliasInfo; -import org.apache.olingo.commons.api.edm.helper.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.exception.ODataException; +import org.apache.olingo.odata4.commons.api.edm.helper.AliasInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EntityContainerInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.exception.ODataException; public interface EdmProvider { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProviderAdapter.java similarity index 89% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProviderAdapter.java index b3eeb81be..8633ee270 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EdmProviderAdapter.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EdmProviderAdapter.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.AliasInfo; -import org.apache.olingo.commons.api.edm.helper.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.exception.ODataException; +import org.apache.olingo.odata4.commons.api.edm.helper.AliasInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EntityContainerInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.exception.ODataException; //TODO: Finish /** diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityContainer.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainer.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityContainer.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainer.java index fc4f7655f..4d43c94cd 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityContainer.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityContainer.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: finish public class EntityContainer { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySet.java similarity index 93% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySet.java index 0e2e0c36d..435ed8af7 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySet.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySet.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class EntitySet extends BindingTarget { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySetPath.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySetPath.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySetPath.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySetPath.java index e489fb5f0..eaaae9b39 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntitySetPath.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntitySetPath.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; //TODO: finish //DO we really need this class? diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityType.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityType.java index 90853a449..c5ff3d919 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EntityType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EntityType.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class EntityType extends StructuralType { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumMember.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumMember.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumMember.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumMember.java index 1ff24e9e4..6450793db 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumMember.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumMember.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; //TODO: Finish public class EnumMember { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumType.java similarity index 93% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumType.java index e010c328b..38e5bd3cc 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/EnumType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/EnumType.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class EnumType { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Expression.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Expression.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Expression.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Expression.java index 954543233..1e2bee642 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Expression.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Expression.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; //TODO: Expression implementation public class Expression { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Function.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Function.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Function.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Function.java index 8c1a8082b..d2539d9dc 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Function.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Function.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FunctionImport.java similarity index 93% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FunctionImport.java index 70711714e..098e678aa 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/FunctionImport.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/FunctionImport.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class FunctionImport extends OperationImport { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Mapping.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Mapping.java index defd1d23e..b5d5c1df2 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Mapping.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Mapping.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.EdmMapping; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmMapping; public class Mapping implements EdmMapping { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationProperty.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/NavigationProperty.java similarity index 93% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationProperty.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/NavigationProperty.java index 363ba60b4..22b26ad21 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationProperty.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/NavigationProperty.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.constants.EdmOnDelete; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmOnDelete; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: finish public class NavigationProperty { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/NavigationPropertyBinding.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/NavigationPropertyBinding.java index fbeb61372..15517f98f 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/NavigationPropertyBinding.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/NavigationPropertyBinding.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; //TODO: finish public class NavigationPropertyBinding { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Operation.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Operation.java similarity index 97% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Operation.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Operation.java index 356f710b2..db0f120fe 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Operation.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Operation.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/OperationImport.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/OperationImport.java index 7e1df45b9..02433eccc 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/OperationImport.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/OperationImport.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; //TODO: finish public abstract class OperationImport { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Parameter.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Parameter.java index 23a1fd058..8d7a6c07c 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Parameter.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Parameter.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: finish public class Parameter { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Property.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Property.java index 1a7ffaa6c..3936e4c1b 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Property.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Property.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class Property { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/PropertyRef.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/PropertyRef.java index 44b9bafd6..f26bda77b 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/PropertyRef.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/PropertyRef.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; public class PropertyRef { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReferentialConstraint.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ReferentialConstraint.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReferentialConstraint.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ReferentialConstraint.java index dd5231637..c9828b8ea 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReferentialConstraint.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ReferentialConstraint.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; //TODO: finish public class ReferentialConstraint { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReturnType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ReturnType.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReturnType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ReturnType.java index 52ee30c97..00130f5cc 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/ReturnType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/ReturnType.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODDO: finish public class ReturnType { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Schema.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Schema.java similarity index 98% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Schema.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Schema.java index 3bfeae614..087512d9e 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Schema.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Schema.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Singleton.java similarity index 91% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Singleton.java index 1d6e17027..ab5a06fde 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Singleton.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Singleton.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class Singleton extends BindingTarget { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/StructuralType.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/StructuralType.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/StructuralType.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/StructuralType.java index 03b85ec92..ec7a52a1b 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/StructuralType.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/StructuralType.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public abstract class StructuralType { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Target.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Target.java similarity index 91% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Target.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Target.java index 127815011..9cdce1a75 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Target.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Target.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public class Target { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Term.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Term.java similarity index 96% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Term.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Term.java index 1970a4348..991a6330c 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/Term.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/Term.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class Term { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TypeDefinition.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/TypeDefinition.java similarity index 94% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TypeDefinition.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/TypeDefinition.java index 594333fc2..7eb978a97 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/edm/provider/TypeDefinition.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/edm/provider/TypeDefinition.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.edm.provider; +package org.apache.olingo.odata4.commons.api.edm.provider; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Finish public class TypeDefinition { diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/exception/ODataException.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/exception/ODataException.java index 27576def2..6b0ba33d2 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataException.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/exception/ODataException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.exception; +package org.apache.olingo.odata4.commons.api.exception; public class ODataException extends Exception { private static final long serialVersionUID = 1L; diff --git a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/exception/ODataNotImplementedException.java similarity index 95% rename from odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java rename to odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/exception/ODataNotImplementedException.java index 132a98915..e546a19ed 100644 --- a/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/commons/api/exception/ODataNotImplementedException.java +++ b/odata4-lib/odata4-commons-api/src/main/java/org/apache/olingo/odata4/commons/api/exception/ODataNotImplementedException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.api.exception; +package org.apache.olingo.odata4.commons.api.exception; public class ODataNotImplementedException extends ODataException { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/ODataCommonsCoreImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/ODataCommonsCoreImpl.java similarity index 81% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/ODataCommonsCoreImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/ODataCommonsCoreImpl.java index 034783036..62171afe6 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/ODataCommonsCoreImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/ODataCommonsCoreImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core; +package org.apache.olingo.odata4.commons.core; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.core.edm.provider.EdmProviderImpl; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.core.edm.provider.EdmProviderImpl; public class ODataCommonsCoreImpl { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java similarity index 95% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java index 040d31af5..713803a81 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/ActionMapKey.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKey.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm; +package org.apache.olingo.odata4.commons.core.edm; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public class ActionMapKey { private final FullQualifiedName actionName; diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java similarity index 91% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java index 2eb4ccb8e..9f919a5b8 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/EdmImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/EdmImpl.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm; +package org.apache.olingo.odata4.commons.core.edm; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.EdmServiceMetadata; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata; +import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public abstract class EdmImpl implements Edm { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java index ea4c9f958..f0b55fd50 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/FunctionMapKey.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKey.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm; +package org.apache.olingo.odata4.commons.core.edm; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public class FunctionMapKey { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractPrimitiveType.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java similarity index 93% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractPrimitiveType.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java index 1240942ca..50fadbe44 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/AbstractPrimitiveType.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/AbstractPrimitiveType.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; /** * Abstract implementation of the EDM primitive-type interface. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinary.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinary.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java index 15be10fbb..12d980c2f 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinary.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinary.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import org.apache.commons.codec.binary.Base64; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Binary. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBoolean.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java similarity index 95% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBoolean.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java index 9b62b1cff..1ef5c82a2 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBoolean.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBoolean.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Boolean. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java index ea768a6eb..4f0154acc 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByte.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByte.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Byte. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDate.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDate.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java index 83d0c4990..97694fbd5 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDate.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDate.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.util.Calendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Date. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java similarity index 98% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java index fe639dd48..05fe3c913 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffset.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffset.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.util.Calendar; import java.util.Date; @@ -24,7 +24,7 @@ import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type DateTimeOffset. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java index 283e718ed..8d600f32b 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimal.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimal.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigDecimal; import java.math.BigInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Decimal. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java index 278164146..f3e5890c5 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDouble.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDouble.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigDecimal; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Double. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDuration.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDuration.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java index 947eb0105..5ea4fa1a6 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDuration.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDuration.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigDecimal; import java.math.BigInteger; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; final class EdmDuration extends SingletonPrimitiveType { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmEnum.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmEnum.java similarity index 93% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmEnum.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmEnum.java index abfae2054..d88a3b2ac 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmEnum.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmEnum.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmMember; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmMember; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; /** * Implementation of the EDM enum type. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuid.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java similarity index 95% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuid.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java index beb4757b5..90cd9a165 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuid.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuid.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.util.UUID; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Guid. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java index 53804e5fa..9ecac4d91 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Int16. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java index bd041c71e..44750cfed 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Int32. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java index ac979ba83..1f23d9197 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Int64. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNull.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNull.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java index 758a7f0c5..8d4d4d6b1 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNull.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNull.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; //TODO: Is this class still necessary? /** diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java similarity index 92% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java index 5bd79543e..3d8fa9460 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmPrimitiveTypeKind.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; //TODO: Should we delete this typekind and use a facade? public enum EdmPrimitiveTypeKind { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java index 4fadc0406..7982b99e8 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByte.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByte.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type SByte. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java index d9c60ce62..234e424a6 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingle.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingle.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.math.BigDecimal; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type Single. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java index 375bbae0b..e2d7e0cc4 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmString.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmString.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the EDM primitive type String. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDay.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDay.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java index 6e93e15ed..9b3ab1f81 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDay.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDay.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import java.util.Calendar; import java.util.TimeZone; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; final class EdmTimeOfDay extends SingletonPrimitiveType { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/SingletonPrimitiveType.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java similarity index 92% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/SingletonPrimitiveType.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java index 9f9d70387..07c23e197 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/SingletonPrimitiveType.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/SingletonPrimitiveType.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; /** * Abstract singleton implementation of the EDM primitive-type interface. diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/Uint7.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/Uint7.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java index 6805fc0f7..bf057cbf3 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/primitivetype/Uint7.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/Uint7.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; /** * Implementation of the internal primitive type "unsigned 7-bit integer". diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImpl.java similarity index 78% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImpl.java index cfdf46dbc..0db129fcd 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Action; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.Action; public class EdmActionImpl extends EdmOperationImpl implements EdmAction { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImportImpl.java similarity index 81% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImportImpl.java index 19d299a61..cb767fc24 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmActionImportImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmActionImportImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.EdmActionImport; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.provider.ActionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.EdmActionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.provider.ActionImport; public class EdmActionImportImpl extends EdmOperationImportImpl implements EdmActionImport { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmBindingTargetImpl.java similarity index 84% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmBindingTargetImpl.java index d9136e067..f42be4c5b 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmBindingTargetImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmBindingTargetImpl.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmBindingTarget; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.provider.BindingTarget; -import org.apache.olingo.commons.api.edm.provider.NavigationPropertyBinding; -import org.apache.olingo.commons.api.edm.provider.Target; +import org.apache.olingo.odata4.commons.api.edm.EdmBindingTarget; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.provider.BindingTarget; +import org.apache.olingo.odata4.commons.api.edm.provider.NavigationPropertyBinding; +import org.apache.olingo.odata4.commons.api.edm.provider.Target; public abstract class EdmBindingTargetImpl extends EdmNamedImpl implements EdmBindingTarget { @@ -58,7 +58,7 @@ public abstract class EdmBindingTargetImpl extends EdmNamedImpl implements EdmBi bindingTarget = entityContainer.getSingleton(targetName); if (bindingTarget != null) { break; - }else{ + } else { throw new EdmException("Cant find target with name: " + targetName); } } else { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmComplexTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java similarity index 78% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmComplexTypeImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java index a6ad4ceeb..eb02bac4c 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmComplexTypeImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmStructuralType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.ComplexType; public class EdmComplexTypeImpl extends EdmStructuralTypeImpl implements EdmComplexType { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmElementImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmElementImpl.java similarity index 90% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmElementImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmElementImpl.java index a229ef143..c731a08b4 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmElementImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmElementImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmElement; +import org.apache.olingo.odata4.commons.api.edm.EdmElement; public abstract class EdmElementImpl extends EdmNamedImpl implements EdmElement { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImpl.java similarity index 81% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImpl.java index e9759c973..15b666ca8 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityContainerImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityContainerImpl.java @@ -16,25 +16,25 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.HashMap; import java.util.Map; -import org.apache.olingo.commons.api.edm.EdmActionImport; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmFunctionImport; -import org.apache.olingo.commons.api.edm.EdmSingleton; -import org.apache.olingo.commons.api.edm.helper.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ActionImport; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntitySet; -import org.apache.olingo.commons.api.edm.provider.FunctionImport; -import org.apache.olingo.commons.api.edm.provider.Singleton; -import org.apache.olingo.commons.api.exception.ODataException; +import org.apache.olingo.odata4.commons.api.edm.EdmActionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmFunctionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmSingleton; +import org.apache.olingo.odata4.commons.api.edm.helper.EntityContainerInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.ActionImport; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.api.edm.provider.EntitySet; +import org.apache.olingo.odata4.commons.api.edm.provider.FunctionImport; +import org.apache.olingo.odata4.commons.api.edm.provider.Singleton; +import org.apache.olingo.odata4.commons.api.exception.ODataException; public class EdmEntityContainerImpl extends EdmNamedImpl implements EdmEntityContainer { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetImpl.java index 86fc3310c..311ee448e 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntitySetImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntitySetImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.commons.api.edm.provider.EntitySet; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; +import org.apache.olingo.odata4.commons.api.edm.provider.EntitySet; public class EdmEntitySetImpl extends EdmBindingTargetImpl implements EdmEntitySet { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java similarity index 85% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityTypeImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java index bed0be9d0..4ba917094 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEntityTypeImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImpl.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; -import org.apache.olingo.commons.api.edm.EdmStructuralType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmKeyPropertyRef; +import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.EntityType; +import org.apache.olingo.odata4.commons.api.edm.provider.PropertyRef; public class EdmEntityTypeImpl extends EdmStructuralTypeImpl implements EdmEntityType { @@ -86,7 +86,7 @@ public class EdmEntityTypeImpl extends EdmStructuralTypeImpl implements EdmEntit if (baseType != null) { return entityBaseType.getKeyPropertyRefs(); } else { - //TODO: Cache + // TODO: Cache return new ArrayList(keyPropertyRefs.values()); } } diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java similarity index 84% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java index b3cd6c69f..605a05167 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmEnumImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEnumImpl.java @@ -16,17 +16,17 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmMember; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.EnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmMember; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.EnumType; public class EdmEnumImpl extends EdmNamedImpl implements EdmEnumType { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImpl.java similarity index 80% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImpl.java index f56c0fc5b..6f610b71d 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Function; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.Function; public class EdmFunctionImpl extends EdmOperationImpl implements EdmFunction { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportImpl.java index ec5f8e8ec..827c76f7b 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmFunctionImportImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmFunctionImportImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.EdmFunctionImport; -import org.apache.olingo.commons.api.edm.provider.FunctionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.EdmFunctionImport; +import org.apache.olingo.odata4.commons.api.edm.provider.FunctionImport; public class EdmFunctionImportImpl extends EdmOperationImportImpl implements EdmFunctionImport { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmKeyPropertyRefImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmKeyPropertyRefImpl.java index c60ebe91d..5798f061e 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmKeyPropertyRefImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmKeyPropertyRefImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; -import org.apache.olingo.commons.api.edm.EdmProperty; -import org.apache.olingo.commons.api.edm.EdmStructuralType; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmKeyPropertyRef; +import org.apache.olingo.odata4.commons.api.edm.EdmProperty; +import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.provider.PropertyRef; public class EdmKeyPropertyRefImpl implements EdmKeyPropertyRef { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmMemberImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmMemberImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmMemberImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmMemberImpl.java index fff0200d9..6b69af7c7 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmMemberImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmMemberImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmMember; -import org.apache.olingo.commons.api.edm.provider.EnumMember; +import org.apache.olingo.odata4.commons.api.edm.EdmMember; +import org.apache.olingo.odata4.commons.api.edm.provider.EnumMember; public class EdmMemberImpl extends EdmNamedImpl implements EdmMember { private final EnumMember member; - public EdmMemberImpl(EdmProviderImpl edm, EnumMember member) { + public EdmMemberImpl(final EdmProviderImpl edm, final EnumMember member) { super(edm, member.getName()); this.member = member; } diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmNamedImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNamedImpl.java similarity index 91% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmNamedImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNamedImpl.java index 2e9afed5f..be85736f7 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmNamedImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNamedImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmNamed; +import org.apache.olingo.odata4.commons.api.edm.EdmNamed; public abstract class EdmNamedImpl implements EdmNamed { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmNavigationPropertyImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmNavigationPropertyImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImpl.java index c973fff9b..af16c67df 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmNavigationPropertyImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNavigationPropertyImpl.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmNavigationProperty; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmNavigationProperty; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.provider.NavigationProperty; public class EdmNavigationPropertyImpl extends EdmElementImpl implements EdmNavigationProperty { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmOperationImpl.java similarity index 81% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmOperationImpl.java index 2131074ea..d1b49eda9 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmOperationImpl.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.commons.api.edm.EdmOperation; -import org.apache.olingo.commons.api.edm.EdmParameter; -import org.apache.olingo.commons.api.edm.EdmReturnType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Operation; -import org.apache.olingo.commons.api.edm.provider.Parameter; +import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; +import org.apache.olingo.odata4.commons.api.edm.EdmOperation; +import org.apache.olingo.odata4.commons.api.edm.EdmParameter; +import org.apache.olingo.odata4.commons.api.edm.EdmReturnType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.Operation; +import org.apache.olingo.odata4.commons.api.edm.provider.Parameter; public class EdmOperationImpl extends EdmTypeImpl implements EdmOperation { @@ -72,7 +72,7 @@ public class EdmOperationImpl extends EdmTypeImpl implements EdmOperation { @Override public EdmEntitySet getReturnedEntitySet(final EdmEntitySet bindingParameterEntitySet, final String path) { - //TODO: What here? + // TODO: What here? return null; } diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImportImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmOperationImportImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImportImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmOperationImportImpl.java index d5090809d..040510b95 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmOperationImportImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmOperationImportImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmOperationImport; -import org.apache.olingo.commons.api.edm.provider.OperationImport; -import org.apache.olingo.commons.api.edm.provider.Target; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmOperationImport; +import org.apache.olingo.odata4.commons.api.edm.provider.OperationImport; +import org.apache.olingo.odata4.commons.api.edm.provider.Target; public abstract class EdmOperationImportImpl extends EdmNamedImpl implements EdmOperationImport { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmParameterImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmParameterImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmParameterImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmParameterImpl.java index 496e67108..17226475a 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmParameterImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmParameterImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmParameter; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.helper.EdmMapping; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmParameter; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmMapping; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.Parameter; +import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; public class EdmParameterImpl extends EdmElementImpl implements EdmParameter { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmPropertyImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmPropertyImpl.java similarity index 84% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmPropertyImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmPropertyImpl.java index 71bab4a03..5a0281ff7 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmPropertyImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmPropertyImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmProperty; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.helper.EdmMapping; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmProperty; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmMapping; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.Property; +import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; public class EdmPropertyImpl extends EdmElementImpl implements EdmProperty { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java similarity index 84% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java index d885bab29..08f5f1598 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImpl.java @@ -16,35 +16,35 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.EdmServiceMetadata; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.helper.AliasInfo; -import org.apache.olingo.commons.api.edm.helper.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Action; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; -import org.apache.olingo.commons.api.exception.ODataException; -import org.apache.olingo.commons.core.edm.EdmImpl; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata; +import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.helper.AliasInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EntityContainerInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.Action; +import org.apache.olingo.odata4.commons.api.edm.provider.ComplexType; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.api.edm.provider.EntityType; +import org.apache.olingo.odata4.commons.api.edm.provider.EnumType; +import org.apache.olingo.odata4.commons.api.edm.provider.Function; +import org.apache.olingo.odata4.commons.api.edm.provider.Parameter; +import org.apache.olingo.odata4.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.odata4.commons.api.exception.ODataException; +import org.apache.olingo.odata4.commons.core.edm.EdmImpl; public class EdmProviderImpl extends EdmImpl { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmReturnTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImpl.java similarity index 81% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmReturnTypeImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImpl.java index 8b6154c25..50d9788b9 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmReturnTypeImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmReturnTypeImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmException; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmReturnType; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ReturnType; -import org.apache.olingo.commons.core.edm.EdmImpl; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmReturnType; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.ReturnType; +import org.apache.olingo.odata4.commons.core.edm.EdmImpl; +import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; public class EdmReturnTypeImpl implements EdmReturnType { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImpl.java similarity index 79% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImpl.java index 5feb519f6..13934cf7c 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmServiceMetadataImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmServiceMetadataImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.io.InputStream; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmServiceMetadata; -import org.apache.olingo.commons.api.edm.helper.EdmEntitySetInfo; -import org.apache.olingo.commons.api.edm.helper.EdmFunctionImportInfo; -import org.apache.olingo.commons.api.edm.helper.EdmSingletonInfo; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmEntitySetInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmFunctionImportInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.EdmSingletonInfo; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; public class EdmServiceMetadataImpl implements EdmServiceMetadata { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImpl.java similarity index 82% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImpl.java index 7dcab203e..46856af16 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmSingletonImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmSingletonImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmSingleton; -import org.apache.olingo.commons.api.edm.provider.Singleton; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmSingleton; +import org.apache.olingo.odata4.commons.api.edm.provider.Singleton; public class EdmSingletonImpl extends EdmBindingTargetImpl implements EdmSingleton { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmStructuralTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java similarity index 87% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmStructuralTypeImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java index 942c81683..10b370550 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmStructuralTypeImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmStructuralTypeImpl.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.edm.EdmElement; -import org.apache.olingo.commons.api.edm.EdmStructuralType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.StructuralType; +import org.apache.olingo.odata4.commons.api.edm.EdmElement; +import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.NavigationProperty; +import org.apache.olingo.odata4.commons.api.edm.provider.Property; +import org.apache.olingo.odata4.commons.api.edm.provider.StructuralType; public abstract class EdmStructuralTypeImpl extends EdmTypeImpl implements EdmStructuralType { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeDefinitionImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java similarity index 86% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeDefinitionImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java index 18e28e4d9..d890242b9 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeDefinitionImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeDefinitionImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.TypeDefinition; public class EdmTypeDefinitionImpl extends EdmNamedImpl implements EdmTypeDefinition { diff --git a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeImpl.java b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeImpl.java similarity index 84% rename from odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeImpl.java rename to odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeImpl.java index d82f711ac..b666643e4 100644 --- a/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/commons/core/edm/provider/EdmTypeImpl.java +++ b/odata4-lib/odata4-commons-core/src/main/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeImpl.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public abstract class EdmTypeImpl extends EdmNamedImpl implements EdmType { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/ActionMapKeyTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/ActionMapKeyTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java index c760e771f..02759c88e 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/ActionMapKeyTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/ActionMapKeyTest.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm; +package org.apache.olingo.odata4.commons.core.edm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; import org.junit.Test; public class ActionMapKeyTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java index 9dcbfbc25..0d1fd8821 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCachingTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCachingTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm; +package org.apache.olingo.odata4.commons.core.edm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,16 +31,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.EdmServiceMetadata; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata; +import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; import org.junit.Before; import org.junit.Test; diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java similarity index 91% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java index ee043402c..05612ee03 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/EdmImplCallCreateTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/EdmImplCallCreateTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm; +package org.apache.olingo.odata4.commons.core.edm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -28,16 +28,16 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.EdmServiceMetadata; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata; +import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; import org.junit.Before; import org.junit.Test; diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/FunctionMapKeyTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java similarity index 98% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/FunctionMapKeyTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java index 3e9665978..775dc8a44 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/FunctionMapKeyTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/FunctionMapKeyTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm; +package org.apache.olingo.odata4.commons.core.edm; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertNotSame; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; import org.junit.Test; public class FunctionMapKeyTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java index fc9870d6d..a1325e62d 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/CommonPrimitiveTypeTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -27,8 +27,8 @@ import java.math.BigDecimal; import java.util.Calendar; import java.util.UUID; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; import org.junit.Test; public class CommonPrimitiveTypeTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java index 352b45537..e4f6e6ee5 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBinaryTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBinaryTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmBinaryTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java index a939d3379..8393b83e8 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmBooleanTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmBooleanTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmBooleanTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java index 54bff8a8a..177e34b21 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmByteTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmByteTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmByteTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java index 2a9d2f741..db40bedb6 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; @@ -24,7 +24,7 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmDateTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java index c55f97195..291b2122f 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDateTimeOffsetTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,7 +25,7 @@ import java.util.Calendar; import java.util.Date; import java.util.TimeZone; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmDateTimeOffsetTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java similarity index 98% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java index 07cd73e2b..21d80bb6d 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDecimalTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDecimalTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmDecimalTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java similarity index 98% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java index a6e93fb1d..54d13336e 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDoubleTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDoubleTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmDoubleTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java index 14f54a002..33930444e 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmDurationTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmDurationTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmDurationTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmEnumTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmEnumTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmEnumTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmEnumTest.java index 4321d80e0..883e7d794 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmEnumTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmEnumTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -28,9 +28,9 @@ import static org.mockito.Mockito.when; import java.util.Arrays; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmMember; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmMember; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; import org.junit.Test; public class EdmEnumTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java similarity index 95% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java index f2ee6b006..6fb7561e9 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmGuidTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmGuidTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import java.util.UUID; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmGuidTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java index b5c48497f..f9ec7d6b6 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt16Test.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt16Test.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmInt16Test extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java index b21f77d4f..db3416100 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt32Test.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt32Test.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmInt32Test extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java similarity index 97% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java index faf451fb2..6ebb0d4d9 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmInt64Test.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmInt64Test.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmInt64Test extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java similarity index 93% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java index 98efdc15e..9d39c5501 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmNullTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmNullTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertNull; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmNullTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java index 9ef25c838..249c4bc44 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSByteTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSByteTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmSByteTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java similarity index 98% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java index 33d703e54..adfa8a1cc 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmSingleTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmSingleTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -24,7 +24,7 @@ import static org.junit.Assert.assertTrue; import java.math.BigDecimal; import java.math.BigInteger; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmSingleTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java index aea314f08..d6021c7f0 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmStringTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmStringTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmStringTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java index a98e0d791..ed23a5050 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/EdmTimeOfDayTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/EdmTimeOfDayTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertEquals; import java.util.Calendar; import java.util.TimeZone; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; import org.junit.Test; public class EdmTimeOfDayTest extends PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java similarity index 96% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java index bef72bb08..2450a45b1 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/PrimitiveTypeBaseTest.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeException; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveTypeException; public abstract class PrimitiveTypeBaseTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java similarity index 95% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java index 10993776d..e27abaec6 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/primitivetype/UInt7Test.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/primitivetype/UInt7Test.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.primitivetype; +package org.apache.olingo.odata4.commons.core.edm.primitivetype; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmComplexTypeImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImplTest.java similarity index 88% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmComplexTypeImplTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImplTest.java index 9ee0ff7c5..622ef0434 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmComplexTypeImplTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmComplexTypeImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -28,14 +28,14 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmElement; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmElement; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.ComplexType; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.api.edm.provider.NavigationProperty; +import org.apache.olingo.odata4.commons.api.edm.provider.Property; +import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; import org.junit.Before; import org.junit.Test; diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmEntityTypeImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java similarity index 91% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmEntityTypeImplTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java index afe8fb68f..cd58d8226 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmEntityTypeImplTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmEntityTypeImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -28,19 +28,19 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmElement; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; -import org.apache.olingo.commons.api.edm.EdmProperty; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.NavigationProperty; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmElement; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmKeyPropertyRef; +import org.apache.olingo.odata4.commons.api.edm.EdmProperty; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.ComplexType; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.api.edm.provider.EntityType; +import org.apache.olingo.odata4.commons.api.edm.provider.NavigationProperty; +import org.apache.olingo.odata4.commons.api.edm.provider.Property; +import org.apache.olingo.odata4.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; import org.junit.Before; import org.junit.Test; diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmNamedImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNamedImplTest.java similarity index 91% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmNamedImplTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNamedImplTest.java index b3e1176e7..e6187e694 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmNamedImplTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmNamedImplTest.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import static org.junit.Assert.assertEquals; -import org.apache.olingo.commons.api.edm.EdmNamed; +import org.apache.olingo.odata4.commons.api.edm.EdmNamed; import org.junit.Test; public class EdmNamedImplTest { diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmPropertyImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmPropertyImplTest.java similarity index 94% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmPropertyImplTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmPropertyImplTest.java index 42e2cd1cc..ebc16f46e 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmPropertyImplTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmPropertyImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import org.junit.Test; diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java similarity index 80% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java index d1a1c8a03..9c50e321c 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmProviderImplTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmProviderImplTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -27,25 +27,25 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.helper.EntityContainerInfo; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.Action; -import org.apache.olingo.commons.api.edm.provider.ComplexType; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.EnumType; -import org.apache.olingo.commons.api.edm.provider.Function; -import org.apache.olingo.commons.api.edm.provider.Parameter; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.api.edm.provider.TypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.helper.EntityContainerInfo; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.Action; +import org.apache.olingo.odata4.commons.api.edm.provider.ComplexType; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.api.edm.provider.EntityType; +import org.apache.olingo.odata4.commons.api.edm.provider.EnumType; +import org.apache.olingo.odata4.commons.api.edm.provider.Function; +import org.apache.olingo.odata4.commons.api.edm.provider.Parameter; +import org.apache.olingo.odata4.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.odata4.commons.api.edm.provider.TypeDefinition; import org.junit.Before; import org.junit.Test; diff --git a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmTypeImplTest.java b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeImplTest.java similarity index 85% rename from odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmTypeImplTest.java rename to odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeImplTest.java index 9bcc265ba..579b4967a 100644 --- a/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/commons/core/edm/provider/EdmTypeImplTest.java +++ b/odata4-lib/odata4-commons-core/src/test/java/org/apache/olingo/odata4/commons/core/edm/provider/EdmTypeImplTest.java @@ -16,13 +16,13 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.commons.core.edm.provider; +package org.apache.olingo.odata4.commons.core.edm.provider; import static org.junit.Assert.assertEquals; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; import org.junit.Test; public class EdmTypeImplTest { diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/ODataConsumer.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/ODataConsumer.java similarity index 88% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/ODataConsumer.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/ODataConsumer.java index d8b6c1a0e..abf6d30ad 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/ODataConsumer.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/ODataConsumer.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api; +package org.apache.olingo.odata4.consumer.api; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; //TODO: Exceptionhandling public abstract class ODataConsumer { - private static final String IMPLEMENTATION = "org.apache.olingo.consumer.core.ODataConsumerImpl"; + private static final String IMPLEMENTATION = "org.apache.olingo.odata4.consumer.core.ODataConsumerImpl"; public static ODataConsumer create() { ODataConsumer instance; diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/AnnotationProperty.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/AnnotationProperty.java similarity index 94% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/AnnotationProperty.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/AnnotationProperty.java index 0bea37c13..439066f96 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/AnnotationProperty.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/AnnotationProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; public interface AnnotationProperty extends Property { String getValue(); diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/ComplexValue.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ComplexValue.java similarity index 95% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/ComplexValue.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ComplexValue.java index dcfd06ede..ab4455f61 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/ComplexValue.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ComplexValue.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; import java.util.List; import java.util.Map; diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/ConsumerException.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ConsumerException.java similarity index 95% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/ConsumerException.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ConsumerException.java index aaf75e269..def46363b 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/ConsumerException.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/ConsumerException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; public class ConsumerException extends Exception { diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Entity.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Entity.java similarity index 96% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Entity.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Entity.java index 1ea3b5073..2d4c9b33c 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Entity.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Entity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; import java.util.List; import java.util.Map; diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/EntitySet.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/EntitySet.java similarity index 95% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/EntitySet.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/EntitySet.java index a39c2564b..1efda671e 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/EntitySet.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/EntitySet.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; import java.util.List; diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/NavigationProperty.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/NavigationProperty.java similarity index 94% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/NavigationProperty.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/NavigationProperty.java index 27f6d01f7..67067ea36 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/NavigationProperty.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/NavigationProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; public interface NavigationProperty extends Property { diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Property.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Property.java similarity index 94% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Property.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Property.java index 99be568df..7092f72d6 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Property.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Property.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; public interface Property { String getName(); diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Reader.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Reader.java similarity index 95% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Reader.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Reader.java index 9d4a5bf9f..cf7b01204 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Reader.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Reader.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; import java.io.InputStream; diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/StructuralProperty.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/StructuralProperty.java similarity index 94% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/StructuralProperty.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/StructuralProperty.java index 577efc3e8..3cdc254c9 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/StructuralProperty.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/StructuralProperty.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; import java.util.List; diff --git a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Value.java b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Value.java similarity index 94% rename from odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Value.java rename to odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Value.java index ad9a85a61..7966c50e5 100644 --- a/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/consumer/api/deserializer/Value.java +++ b/odata4-lib/odata4-consumer-api/src/main/java/org/apache/olingo/odata4/consumer/api/deserializer/Value.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.api.deserializer; +package org.apache.olingo.odata4.consumer.api.deserializer; public interface Value { boolean isComplex(); diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/ODataConsumerImpl.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/ODataConsumerImpl.java similarity index 79% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/ODataConsumerImpl.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/ODataConsumerImpl.java index 6003a1329..ec61bba48 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/ODataConsumerImpl.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/ODataConsumerImpl.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core; +package org.apache.olingo.odata4.consumer.core; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.commons.core.ODataCommonsCoreImpl; -import org.apache.olingo.consumer.api.ODataConsumer; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.commons.core.ODataCommonsCoreImpl; +import org.apache.olingo.odata4.consumer.api.ODataConsumer; public class ODataConsumerImpl extends ODataConsumer { diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/AnnotationPropertyImpl.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/AnnotationPropertyImpl.java similarity index 91% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/AnnotationPropertyImpl.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/AnnotationPropertyImpl.java index 67b93c3e8..f404f02ba 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/AnnotationPropertyImpl.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/AnnotationPropertyImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; -import org.apache.olingo.consumer.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; public class AnnotationPropertyImpl implements AnnotationProperty { diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/ComplexValueImpl.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/ComplexValueImpl.java similarity index 85% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/ComplexValueImpl.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/ComplexValueImpl.java index df52cf178..e50cecfe6 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/ComplexValueImpl.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/ComplexValueImpl.java @@ -16,16 +16,16 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.util.Collections; import java.util.Map; -import org.apache.olingo.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Value; public class ComplexValueImpl extends PropertyCollection implements ComplexValue { diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntityImpl.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntityImpl.java similarity index 88% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntityImpl.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntityImpl.java index 25d0bf330..dd4808346 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntityImpl.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntityImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.util.Map; -import org.apache.olingo.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.consumer.api.deserializer.Entity; -import org.apache.olingo.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.consumer.api.deserializer.Property; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Entity; +import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Property; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; public class EntityImpl extends PropertyCollection implements Entity { diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntitySetBuilder.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetBuilder.java similarity index 94% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntitySetBuilder.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetBuilder.java index cec6ef7e2..35a98d879 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntitySetBuilder.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetBuilder.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.io.IOException; -import org.apache.olingo.consumer.api.deserializer.EntitySet; +import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntitySetImpl.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetImpl.java similarity index 93% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntitySetImpl.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetImpl.java index 3e1ff1355..2b55e4c8a 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/EntitySetImpl.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/EntitySetImpl.java @@ -16,15 +16,15 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import org.apache.olingo.consumer.api.deserializer.Entity; -import org.apache.olingo.consumer.api.deserializer.EntitySet; +import org.apache.olingo.odata4.consumer.api.deserializer.Entity; +import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; import com.fasterxml.jackson.core.JsonParseException; diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/JsonReader.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReader.java similarity index 85% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/JsonReader.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReader.java index 82be545ff..2129a92d8 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/JsonReader.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReader.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.io.IOException; import java.io.InputStream; import java.util.Map; -import org.apache.olingo.consumer.api.deserializer.ConsumerException; -import org.apache.olingo.consumer.api.deserializer.Entity; -import org.apache.olingo.consumer.api.deserializer.EntitySet; -import org.apache.olingo.consumer.api.deserializer.Property; -import org.apache.olingo.consumer.api.deserializer.Reader; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.ConsumerException; +import org.apache.olingo.odata4.consumer.api.deserializer.Entity; +import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; +import org.apache.olingo.odata4.consumer.api.deserializer.Property; +import org.apache.olingo.odata4.consumer.api.deserializer.Reader; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonParseException; diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/NavigationPropertyImpl.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/NavigationPropertyImpl.java similarity index 95% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/NavigationPropertyImpl.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/NavigationPropertyImpl.java index 507f2f1d9..2a43ca882 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/NavigationPropertyImpl.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/NavigationPropertyImpl.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; -import org.apache.olingo.consumer.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; public class NavigationPropertyImpl implements NavigationProperty { diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PrimitiveValue.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PrimitiveValue.java similarity index 92% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PrimitiveValue.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PrimitiveValue.java index 8a400bcb2..01e9b6183 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PrimitiveValue.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PrimitiveValue.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; -import org.apache.olingo.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.consumer.api.deserializer.Value; public class PrimitiveValue implements Value { diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PropertyCollection.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollection.java similarity index 91% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PropertyCollection.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollection.java index 9208796bc..de5679abc 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PropertyCollection.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollection.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.util.ArrayList; import java.util.Collections; @@ -24,10 +24,10 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.olingo.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.consumer.api.deserializer.Property; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Property; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; abstract class PropertyCollection { protected Map annotationProperties = new HashMap(); diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PropertyCollectionBuilder.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollectionBuilder.java similarity index 91% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PropertyCollectionBuilder.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollectionBuilder.java index 45270058f..fa92ec4a6 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/PropertyCollectionBuilder.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/PropertyCollectionBuilder.java @@ -16,20 +16,20 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import org.apache.olingo.consumer.api.deserializer.AnnotationProperty; -import org.apache.olingo.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.consumer.api.deserializer.Entity; -import org.apache.olingo.consumer.api.deserializer.NavigationProperty; -import org.apache.olingo.consumer.api.deserializer.Property; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.consumer.api.deserializer.AnnotationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.consumer.api.deserializer.Entity; +import org.apache.olingo.odata4.consumer.api.deserializer.NavigationProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Property; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Value; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; diff --git a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/StructuralPropertyImpl.java b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/StructuralPropertyImpl.java similarity index 92% rename from odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/StructuralPropertyImpl.java rename to odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/StructuralPropertyImpl.java index 7da81f650..5e88417d5 100644 --- a/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/consumer/core/deserializer/StructuralPropertyImpl.java +++ b/odata4-lib/odata4-consumer-core/src/main/java/org/apache/olingo/odata4/consumer/core/deserializer/StructuralPropertyImpl.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Value; public class StructuralPropertyImpl implements StructuralProperty { diff --git a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/ODataConsumerTest.java b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/ODataConsumerTest.java similarity index 87% rename from odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/ODataConsumerTest.java rename to odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/ODataConsumerTest.java index 20685d177..bde0de5b5 100644 --- a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/ODataConsumerTest.java +++ b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/ODataConsumerTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core; +package org.apache.olingo.odata4.consumer.core; -import org.apache.olingo.commons.api.edm.provider.EdmProvider; -import org.apache.olingo.consumer.api.ODataConsumer; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProvider; +import org.apache.olingo.odata4.consumer.api.ODataConsumer; import org.junit.Before; import org.junit.Test; diff --git a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/deserializer/JsonReaderPerformance.java b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderPerformance.java similarity index 86% rename from odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/deserializer/JsonReaderPerformance.java rename to odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderPerformance.java index aac6ad0df..e88c76a34 100644 --- a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/deserializer/JsonReaderPerformance.java +++ b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderPerformance.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -25,11 +25,11 @@ import static org.junit.Assert.assertTrue; import java.io.InputStream; -import org.apache.olingo.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.consumer.api.deserializer.Property; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.consumer.api.deserializer.Value; -import org.apache.olingo.consumer.core.testutil.StringHelper; +import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.consumer.api.deserializer.Property; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.consumer.core.testutil.StringHelper; import org.junit.Test; public class JsonReaderPerformance { diff --git a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/deserializer/JsonReaderTest.java b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderTest.java similarity index 96% rename from odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/deserializer/JsonReaderTest.java rename to odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderTest.java index a49afcc7e..978282e7d 100644 --- a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/deserializer/JsonReaderTest.java +++ b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/deserializer/JsonReaderTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.deserializer; +package org.apache.olingo.odata4.consumer.core.deserializer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -31,13 +31,13 @@ import java.util.List; import junit.framework.Assert; -import org.apache.olingo.consumer.api.deserializer.ComplexValue; -import org.apache.olingo.consumer.api.deserializer.Entity; -import org.apache.olingo.consumer.api.deserializer.EntitySet; -import org.apache.olingo.consumer.api.deserializer.Property; -import org.apache.olingo.consumer.api.deserializer.Reader; -import org.apache.olingo.consumer.api.deserializer.StructuralProperty; -import org.apache.olingo.consumer.api.deserializer.Value; +import org.apache.olingo.odata4.consumer.api.deserializer.ComplexValue; +import org.apache.olingo.odata4.consumer.api.deserializer.Entity; +import org.apache.olingo.odata4.consumer.api.deserializer.EntitySet; +import org.apache.olingo.odata4.consumer.api.deserializer.Property; +import org.apache.olingo.odata4.consumer.api.deserializer.Reader; +import org.apache.olingo.odata4.consumer.api.deserializer.StructuralProperty; +import org.apache.olingo.odata4.consumer.api.deserializer.Value; import org.junit.Test; public class JsonReaderTest { diff --git a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/testutil/StringHelper.java b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/testutil/StringHelper.java similarity index 98% rename from odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/testutil/StringHelper.java rename to odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/testutil/StringHelper.java index 9dbefa629..4344cad47 100644 --- a/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/consumer/core/testutil/StringHelper.java +++ b/odata4-lib/odata4-consumer-core/src/test/java/org/apache/olingo/odata4/consumer/core/testutil/StringHelper.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.consumer.core.testutil; +package org.apache.olingo.odata4.consumer.core.testutil; import java.io.BufferedReader; import java.io.ByteArrayInputStream; diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/KeyPredicate.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/KeyPredicate.java similarity index 93% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/KeyPredicate.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/KeyPredicate.java index 812a1b574..d4dcd2972 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/KeyPredicate.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/KeyPredicate.java @@ -16,10 +16,9 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; - -import org.apache.olingo.commons.api.edm.EdmProperty; +package org.apache.olingo.odata4.producer.api.uri; +import org.apache.olingo.odata4.commons.api.edm.EdmProperty; /** * Key predicate, consisting of a simple-type property and its value as String literal diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfo.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo.java similarity index 95% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfo.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo.java index a5ee342cf..66bd8e5f6 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfo.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; +package org.apache.olingo.odata4.producer.api.uri; public interface UriInfo { public UriInfoKind getKind(); diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfo1.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo1.java similarity index 93% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfo1.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo1.java index e629657f2..629e640be 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfo1.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfo1.java @@ -16,14 +16,12 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; - +package org.apache.olingo.odata4.producer.api.uri; import java.util.Collections; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmBindingTarget; - +import org.apache.olingo.odata4.commons.api.edm.EdmBindingTarget; public class UriInfo1 { private UriType uriType; diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfoBatch.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoBatch.java similarity index 92% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfoBatch.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoBatch.java index 0d2add173..13b6673b6 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfoBatch.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoBatch.java @@ -17,8 +17,8 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; +package org.apache.olingo.odata4.producer.api.uri; -public interface UriInfoBatch { +public interface UriInfoBatch { } diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfoKind.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoKind.java similarity index 92% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfoKind.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoKind.java index e099d2491..b39041bca 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriInfoKind.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriInfoKind.java @@ -17,8 +17,8 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; +package org.apache.olingo.odata4.producer.api.uri; public enum UriInfoKind { - batch,all, crossjoin; + batch, all, crossjoin; } diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriPathInfo.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriPathInfo.java similarity index 90% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriPathInfo.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriPathInfo.java index 5f15f5c57..f3d17a49b 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriPathInfo.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriPathInfo.java @@ -17,9 +17,9 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; +package org.apache.olingo.odata4.producer.api.uri; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; public interface UriPathInfo { public UriPathInfoKind getKind(); diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriPathInfoKind.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriPathInfoKind.java similarity index 95% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriPathInfoKind.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriPathInfoKind.java index 878679e58..50aed08e0 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriPathInfoKind.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriPathInfoKind.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; +package org.apache.olingo.odata4.producer.api.uri; public enum UriPathInfoKind { entitySet, singleton, actionImport, functioncall; diff --git a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriType.java b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriType.java similarity index 97% rename from odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriType.java rename to odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriType.java index 11e15214b..a06a71213 100644 --- a/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/producer/api/uri/UriType.java +++ b/odata4-lib/odata4-producer-api/src/main/java/org/apache/olingo/odata4/producer/api/uri/UriType.java @@ -16,8 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.api.uri; - +package org.apache.olingo.odata4.producer.api.uri; public enum UriType { TYPE_ENTITY_SET, diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/ErrorHandler.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/ErrorHandler.java similarity index 94% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/ErrorHandler.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/ErrorHandler.java index e6b0208fb..7f9761c52 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/ErrorHandler.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/ErrorHandler.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; import java.util.Collections; import java.util.List; @@ -27,7 +27,6 @@ import org.antlr.v4.runtime.RecognitionException; import org.antlr.v4.runtime.Recognizer; import org.apache.olingo.producer.core.uri.antlr.UriLexer; - public class ErrorHandler extends BaseErrorListener { @Override public void syntaxError(final Recognizer recognizer, final Object offendingSymbol, @@ -42,7 +41,7 @@ public class ErrorHandler extends BaseErrorListener { // String lexerTokenName =TestSuiteLexer.tokenNames[e.getOffendingToken().getType()]; String lexerTokenName = ""; try { - //lexerTokenName = UriLexer.tokenNames[e.getOffendingToken().getType()]; + // lexerTokenName = UriLexer.tokenNames[e.getOffendingToken().getType()]; lexerTokenName = UriLexer.tokenNames[e.getOffendingToken().getType()]; } catch (ArrayIndexOutOfBoundsException es) { lexerTokenName = "token error"; diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/KeyPredicateImpl.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/KeyPredicateImpl.java similarity index 90% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/KeyPredicateImpl.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/KeyPredicateImpl.java index c5209fda6..bbc301f1e 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/KeyPredicateImpl.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/KeyPredicateImpl.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; -import org.apache.olingo.commons.api.edm.EdmProperty; -import org.apache.olingo.producer.api.uri.KeyPredicate; +import org.apache.olingo.odata4.commons.api.edm.EdmProperty; +import org.apache.olingo.odata4.producer.api.uri.KeyPredicate; /** * diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriInfoImpl.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImpl.java similarity index 59% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriInfoImpl.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImpl.java index 129af4d83..8a4fe52c8 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriInfoImpl.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriInfoImpl.java @@ -16,51 +16,53 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.producer.api.uri.UriInfo; -import org.apache.olingo.producer.api.uri.UriInfoBatch; -import org.apache.olingo.producer.api.uri.UriInfoKind; -import org.apache.olingo.producer.api.uri.UriPathInfo; +import org.apache.olingo.odata4.producer.api.uri.UriInfo; +import org.apache.olingo.odata4.producer.api.uri.UriInfoBatch; +import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; +import org.apache.olingo.odata4.producer.api.uri.UriPathInfo; public class UriInfoImpl implements UriInfo, UriInfoBatch { private UriInfoKind kind; private List uriPathInfos = new ArrayList(); + @Override public UriInfoKind getKind() { return kind; } - public UriInfoImpl setKind(UriInfoKind kind) { + public UriInfoImpl setKind(final UriInfoKind kind) { this.kind = kind; return this; } - public void addUriPathInfo(UriPathInfo uriPathInfo) { + public void addUriPathInfo(final UriPathInfo uriPathInfo) { uriPathInfos.add(uriPathInfo); } - + /* - private Edm edm = null; - private List pathInfos = new ArrayList(); - - public Edm getEdm() { - return edm; - } - - public void addUriPathInfo(final UriPathInfoImpl uriPathInfoImpl) { - pathInfos.add(uriPathInfoImpl); - } - - public UriPathInfoImpl getLastUriPathInfo() { - if (!pathInfos.isEmpty()) { - return pathInfos.get(pathInfos.size() - 1); - } else { - return null; - } - }*/ + * private Edm edm = null; + * private List pathInfos = new ArrayList(); + * + * public Edm getEdm() { + * return edm; + * } + * + * public void addUriPathInfo(final UriPathInfoImpl uriPathInfoImpl) { + * pathInfos.add(uriPathInfoImpl); + * } + * + * public UriPathInfoImpl getLastUriPathInfo() { + * if (!pathInfos.isEmpty()) { + * return pathInfos.get(pathInfos.size() - 1); + * } else { + * return null; + * } + * } + */ } diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriParserImpl.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserImpl.java similarity index 61% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriParserImpl.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserImpl.java index d81d0fd10..737aa0045 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriParserImpl.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriParserImpl.java @@ -16,27 +16,22 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; - -import java.util.ArrayList; -import java.util.List; +package org.apache.olingo.odata4.producer.core.uri; import org.antlr.v4.runtime.ANTLRInputStream; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.DefaultErrorStrategy; import org.antlr.v4.runtime.atn.PredictionMode; import org.antlr.v4.runtime.tree.ParseTree; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmActionImport; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.commons.api.edm.EdmFunctionImport; -import org.apache.olingo.commons.api.edm.EdmNamed; -import org.apache.olingo.commons.api.edm.EdmSingleton; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.producer.api.uri.KeyPredicate; -import org.apache.olingo.producer.api.uri.UriInfoKind; -import org.apache.olingo.producer.api.uri.UriPathInfoKind; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.EdmActionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; +import org.apache.olingo.odata4.commons.api.edm.EdmFunctionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmNamed; +import org.apache.olingo.odata4.commons.api.edm.EdmSingleton; +import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; +import org.apache.olingo.odata4.producer.api.uri.UriPathInfoKind; import org.apache.olingo.producer.core.uri.antlr.UriLexer; import org.apache.olingo.producer.core.uri.antlr.UriParserParser; import org.apache.olingo.producer.core.uri.antlr.UriParserParser.AllAltContext; @@ -52,7 +47,6 @@ import org.apache.olingo.producer.core.uri.antlr.UriParserParser.ResourcePathAlt public class UriParserImpl { - private EdmEntityContainer entityContainer = null; public UriInfoImpl readUri(final String uri, final Edm edm) { @@ -65,8 +59,8 @@ public class UriParserImpl { return ret; } - UriInfoImpl readODataRelativeUri(OdataRelativeUriContext root) { - int i = root.getChildCount(); + UriInfoImpl readODataRelativeUri(final OdataRelativeUriContext root) { + root.getChildCount(); if (root instanceof BatchAltContext) { return new UriInfoImpl().setKind(UriInfoKind.batch); @@ -84,7 +78,7 @@ public class UriParserImpl { return null; } - private UriInfoImpl readResourcePath(OdataRelativeUriContext root) { + private UriInfoImpl readResourcePath(final OdataRelativeUriContext root) { ParseTree firstChild = root.getChild(0); if (firstChild instanceof AllAltContext) { @@ -98,7 +92,7 @@ public class UriParserImpl { return null; } - private UriInfoImpl readPathSegments(PathSegmentsAltContext pathSegmentsAlt) { + private UriInfoImpl readPathSegments(final PathSegmentsAltContext pathSegmentsAlt) { PathSegmentsContext firstChild = (PathSegmentsContext) pathSegmentsAlt.getChild(0); UriInfoImpl uriInfo = new UriInfoImpl(); @@ -112,17 +106,18 @@ public class UriParserImpl { return null; } - private void readFirstPathSegment(UriInfoImpl uriInfo, PathSegmentContext ctx) { - /*if (ctx.ns != null) {//TODO implement - // Error: First pathsegment can not be qualified. Allowed is entityset|function... - }*/ + private void readFirstPathSegment(final UriInfoImpl uriInfo, final PathSegmentContext ctx) { + /* + * if (ctx.ns != null) {//TODO implement + * // Error: First pathsegment can not be qualified. Allowed is entityset|function... + * } + */ - /*if (ctx.odi == null) {//TODO implement - // Error: First pathsegment must contain an odata identifier - }*/ - - - String odataIdentifier = ""; //TODO ctx.odi.getText(); + /* + * if (ctx.odi == null) {//TODO implement + * // Error: First pathsegment must contain an odata identifier + * } + */ // get element "odataIdentifier" from EDM EdmNamed edmObject = null;// entityContainer.getElement(odataIdentifier); @@ -141,10 +136,12 @@ public class UriParserImpl { pathInfo.setCollection(true); // TODO check if kp may have been collected into fp - /*if (ctx.kp != null) { - //pathInfo.setKeyPredicates(readkeypredicates(ctx.kp, entityset.getEntityType())); - pathInfo.setCollection(false); - }*/ + /* + * if (ctx.kp != null) { + * //pathInfo.setKeyPredicates(readkeypredicates(ctx.kp, entityset.getEntityType())); + * pathInfo.setCollection(false); + * } + */ uriInfo.addUriPathInfo(pathInfo); return; } else if (edmObject instanceof EdmSingleton) { @@ -175,16 +172,19 @@ public class UriParserImpl { // is EdmFunctionImport - EdmFunctionImport fi = (EdmFunctionImport) edmObject; UriPathInfoImplFunctionImport pathInfo = new UriPathInfoImplFunctionImport(); pathInfo.setKind(UriPathInfoKind.functioncall); - /*if (ctx.fp != null) { - pathInfo.setFunctionParameter(readFunctionParameters(uriInfo, ctx.fp)); - }*/ - /*if (ctx.kp != null) { - pathInfo.setKeyPredicates(readkeypredicates(ctx.kp, fi.getReturnedEntitySet().getEntityType())); - }*/ + /* + * if (ctx.fp != null) { + * pathInfo.setFunctionParameter(readFunctionParameters(uriInfo, ctx.fp)); + * } + */ + /* + * if (ctx.kp != null) { + * pathInfo.setKeyPredicates(readkeypredicates(ctx.kp, fi.getReturnedEntitySet().getEntityType())); + * } + */ uriInfo.addUriPathInfo(pathInfo); return; @@ -192,73 +192,11 @@ public class UriParserImpl { } - private Object readFunctionParameters(UriInfoImpl uriInfo/*, FunctionParametersContext fp*/) { - // TODO Auto-generated method stub - return null; - } - - private List readkeypredicates(/*final KeypredicatesContext kp,*/ final EdmType edmType1) { -/* - EdmEntityType edmType; - if (edmType1 instanceof EdmEntityType) { - edmType = (EdmEntityType) edmType1; - } else { - return null;// TODO better error - } -*/ - List ret = new ArrayList(); -/* - ParseTree child = kp.getChild(0); - if (child instanceof SimpleKeyContext) { - // it is a simple key without a name - - if (edmType.getKeyPredicateNames().size() != 1) { - // Error Simple Key only allowed if there is only one keyproperty - } - - String keyPredicateName = edmType.getKeyPredicateNames().get(0); - String keyPropertyName = edmType.getKeyPropertyRef(keyPredicateName).getKeyPropertyName(); - EdmElement property = edmType.getProperty(keyPropertyName); - if (property == null) { - // error keyproperty not found - } - - EdmType type = property.getType(); - if (type.getKind() != EdmTypeKind.PRIMITIVE) { - // error property has wrong type - } - - String keyLiteral = child.getText(); - // TODO detect type of keyLiteral and compare with "type" - - ret.add(new KeyPredicateImpl(keyLiteral, (EdmProperty) property)); - } else if (child instanceof CompoundKeyContext) { - CompoundKeyContext compoundKey = (CompoundKeyContext) child; - - for (KeyValuePairContext kvp : compoundKey.kvp) { - String keyPropertyName = kvp.odi.getText(); - EdmElement property = edmType.getProperty(keyPropertyName); - if (property == null) { - // error keyproperty not found - } - - String keyLiteral = kvp.val.getText(); - // TODO detect type of keyLiteral and compare with "type" - - KeyPredicate keyPredicate = new KeyPredicateImpl(keyLiteral, (EdmProperty) property); - ret.add(keyPredicate); - } - - } -*/ - return ret; - } - private OdataRelativeUriContext parseUri(final String uri) { ANTLRInputStream input = new ANTLRInputStream(uri); - //UriLexer lexer = new UriLexer(input); + // UriLexer lexer = new UriLexer(input); UriLexer lexer = new UriLexer(input); CommonTokenStream tokens = new CommonTokenStream(lexer); diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoActionImportImpl.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoActionImportImpl.java similarity index 95% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoActionImportImpl.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoActionImportImpl.java index 71fd27433..23dede30b 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoActionImportImpl.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoActionImportImpl.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; public class UriPathInfoActionImportImpl extends UriPathInfoImpl { diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoEntitySetImpl.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoEntitySetImpl.java similarity index 79% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoEntitySetImpl.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoEntitySetImpl.java index 4b382ca7e..8d80e1efc 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoEntitySetImpl.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoEntitySetImpl.java @@ -17,26 +17,25 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; import java.util.List; -import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.producer.api.uri.KeyPredicate; +import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; +import org.apache.olingo.odata4.producer.api.uri.KeyPredicate; public class UriPathInfoEntitySetImpl extends UriPathInfoImpl { private EdmEntitySet targetEntityset; - - private List keyPredicates; + private List keyPredicates; public EdmEntitySet getTargetEntityset() { return targetEntityset; } - //TODO add to Interface UriPathInfoEntitySet - public void setTargetEntityset(EdmEntitySet targetEntityset) { + // TODO add to Interface UriPathInfoEntitySet + public void setTargetEntityset(final EdmEntitySet targetEntityset) { this.targetEntityset = targetEntityset; } @@ -44,7 +43,7 @@ public class UriPathInfoEntitySetImpl extends UriPathInfoImpl { return keyPredicates; } - public void setKeyPredicates(List keyPredicates) { + public void setKeyPredicates(final List keyPredicates) { this.keyPredicates = keyPredicates; } diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoImpl.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoImpl.java similarity index 76% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoImpl.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoImpl.java index d6d3124be..4a2636d5d 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoImpl.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoImpl.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.producer.api.uri.UriPathInfo; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.producer.api.uri.UriPathInfo; +import org.apache.olingo.odata4.producer.api.uri.UriPathInfoKind; //import org.apache.olingo.api.commons.InlineCount; //import org.apache.olingo.api.uri.NavigationPropertySegment; //import org.apache.olingo.api.uri.NavigationSegment; //import org.apache.olingo.api.uri.SelectItem; //import org.apache.olingo.api.uri.expression.FilterExpression; //import org.apache.olingo.api.uri.expression.OrderByExpression; -import org.apache.olingo.producer.api.uri.UriPathInfoKind; /** * @@ -38,36 +38,38 @@ public class UriPathInfoImpl implements UriPathInfo { private boolean isCollection; private EdmEntityType targetType; + @Override public EdmEntityContainer getEntityContainer() { return entityContainer; } - public void setEntityContainer(EdmEntityContainer entityContainer) { + public void setEntityContainer(final EdmEntityContainer entityContainer) { this.entityContainer = entityContainer; } + @Override public UriPathInfoKind getKind() { return kind; } - public void setKind(UriPathInfoKind kind) { + public void setKind(final UriPathInfoKind kind) { this.kind = kind; } + @Override public boolean isCollection() { return isCollection; } - public void setCollection(boolean isCollection) { + public void setCollection(final boolean isCollection) { this.isCollection = isCollection; } - public EdmEntityType getTargetType() { return targetType; } - - public void setTargetType(EdmEntityType targetType) { + + public void setTargetType(final EdmEntityType targetType) { this.targetType = targetType; } } diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoImplFunctionImport.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoImplFunctionImport.java similarity index 82% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoImplFunctionImport.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoImplFunctionImport.java index be7c5e4ad..c25b1f698 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoImplFunctionImport.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoImplFunctionImport.java @@ -17,15 +17,15 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; import java.util.List; -import org.apache.olingo.producer.api.uri.KeyPredicate; +import org.apache.olingo.odata4.producer.api.uri.KeyPredicate; public class UriPathInfoImplFunctionImport extends UriPathInfoImpl { - //TODO change to proper Type + // TODO change to proper Type private Object functionParameter; private List keyPredicates; @@ -33,17 +33,16 @@ public class UriPathInfoImplFunctionImport extends UriPathInfoImpl { return functionParameter; } - public void setFunctionParameter(Object functionParameter) { + public void setFunctionParameter(final Object functionParameter) { this.functionParameter = functionParameter; } - + public List getKeyPredicates() { return keyPredicates; } - public void setKeyPredicates(List keyPredicates) { + public void setKeyPredicates(final List keyPredicates) { this.keyPredicates = keyPredicates; } - } diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoSigletonImpl.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoSigletonImpl.java similarity index 95% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoSigletonImpl.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoSigletonImpl.java index f2c8f7dca..3311a4794 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/UriPathInfoSigletonImpl.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/UriPathInfoSigletonImpl.java @@ -17,7 +17,7 @@ * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri; +package org.apache.olingo.odata4.producer.core.uri; public class UriPathInfoSigletonImpl extends UriPathInfoImpl { diff --git a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/antlr/ParserException.java b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/antlr/ParserException.java similarity index 95% rename from odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/antlr/ParserException.java rename to odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/antlr/ParserException.java index 32c7be7a7..aeca7068e 100644 --- a/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/producer/core/uri/antlr/ParserException.java +++ b/odata4-lib/odata4-producer-core/src/main/java/org/apache/olingo/odata4/producer/core/uri/antlr/ParserException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.uri.antlr; +package org.apache.olingo.odata4.producer.core.uri.antlr; public class ParserException extends Exception { diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmMock.java similarity index 96% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmMock.java index 191019039..426fc1305 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmMock.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmMock.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -24,28 +24,28 @@ import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.commons.api.edm.EdmAction; -import org.apache.olingo.commons.api.edm.EdmActionImport; -import org.apache.olingo.commons.api.edm.EdmComplexType; -import org.apache.olingo.commons.api.edm.EdmEntityContainer; -import org.apache.olingo.commons.api.edm.EdmEntitySet; -import org.apache.olingo.commons.api.edm.EdmEntityType; -import org.apache.olingo.commons.api.edm.EdmEnumType; -import org.apache.olingo.commons.api.edm.EdmFunction; -import org.apache.olingo.commons.api.edm.EdmFunctionImport; -import org.apache.olingo.commons.api.edm.EdmKeyPropertyRef; -import org.apache.olingo.commons.api.edm.EdmNavigationProperty; -import org.apache.olingo.commons.api.edm.EdmPrimitiveType; -import org.apache.olingo.commons.api.edm.EdmProperty; -import org.apache.olingo.commons.api.edm.EdmReturnType; -import org.apache.olingo.commons.api.edm.EdmServiceMetadata; -import org.apache.olingo.commons.api.edm.EdmSingleton; -import org.apache.olingo.commons.api.edm.EdmStructuralType; -import org.apache.olingo.commons.api.edm.EdmType; -import org.apache.olingo.commons.api.edm.EdmTypeDefinition; -import org.apache.olingo.commons.api.edm.constants.EdmTypeKind; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.commons.api.edm.EdmAction; +import org.apache.olingo.odata4.commons.api.edm.EdmActionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmComplexType; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityContainer; +import org.apache.olingo.odata4.commons.api.edm.EdmEntitySet; +import org.apache.olingo.odata4.commons.api.edm.EdmEntityType; +import org.apache.olingo.odata4.commons.api.edm.EdmEnumType; +import org.apache.olingo.odata4.commons.api.edm.EdmFunction; +import org.apache.olingo.odata4.commons.api.edm.EdmFunctionImport; +import org.apache.olingo.odata4.commons.api.edm.EdmKeyPropertyRef; +import org.apache.olingo.odata4.commons.api.edm.EdmNavigationProperty; +import org.apache.olingo.odata4.commons.api.edm.EdmPrimitiveType; +import org.apache.olingo.odata4.commons.api.edm.EdmProperty; +import org.apache.olingo.odata4.commons.api.edm.EdmReturnType; +import org.apache.olingo.odata4.commons.api.edm.EdmServiceMetadata; +import org.apache.olingo.odata4.commons.api.edm.EdmSingleton; +import org.apache.olingo.odata4.commons.api.edm.EdmStructuralType; +import org.apache.olingo.odata4.commons.api.edm.EdmType; +import org.apache.olingo.odata4.commons.api.edm.EdmTypeDefinition; +import org.apache.olingo.odata4.commons.api.edm.constants.EdmTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; public class EdmMock implements Edm { public static final String NAMESPACE_SCHEMA = "RefScenario"; diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmTechProvider.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechProvider.java similarity index 92% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmTechProvider.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechProvider.java index 47609659d..1a52418ca 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/EdmTechProvider.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/EdmTechProvider.java @@ -16,19 +16,19 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import java.util.Arrays; -import org.apache.olingo.commons.api.edm.helper.FullQualifiedName; -import org.apache.olingo.commons.api.edm.provider.EdmProviderAdapter; -import org.apache.olingo.commons.api.edm.provider.EntitySet; -import org.apache.olingo.commons.api.edm.provider.EntityType; -import org.apache.olingo.commons.api.edm.provider.Property; -import org.apache.olingo.commons.api.edm.provider.PropertyRef; -import org.apache.olingo.commons.api.exception.ODataException; -import org.apache.olingo.commons.api.exception.ODataNotImplementedException; -import org.apache.olingo.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; +import org.apache.olingo.odata4.commons.api.edm.helper.FullQualifiedName; +import org.apache.olingo.odata4.commons.api.edm.provider.EdmProviderAdapter; +import org.apache.olingo.odata4.commons.api.edm.provider.EntitySet; +import org.apache.olingo.odata4.commons.api.edm.provider.EntityType; +import org.apache.olingo.odata4.commons.api.edm.provider.Property; +import org.apache.olingo.odata4.commons.api.edm.provider.PropertyRef; +import org.apache.olingo.odata4.commons.api.exception.ODataException; +import org.apache.olingo.odata4.commons.api.exception.ODataNotImplementedException; +import org.apache.olingo.odata4.commons.core.edm.primitivetype.EdmPrimitiveTypeKind; public class EdmTechProvider extends EdmProviderAdapter { @@ -212,5 +212,4 @@ public class EdmTechProvider extends EdmProviderAdapter { throw new ODataNotImplementedException(); } - } diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/ParseTreeSerializer.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParseTreeSerializer.java similarity index 98% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/ParseTreeSerializer.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParseTreeSerializer.java index 0de75f649..5bf44e232 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/ParseTreeSerializer.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParseTreeSerializer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import java.util.Arrays; import java.util.List; @@ -31,7 +31,7 @@ import org.antlr.v4.runtime.tree.TerminalNode; import org.antlr.v4.runtime.tree.Tree; public class ParseTreeSerializer { - + public static String getTreeAsText(final Tree contextTree, final String[] ruleNames) { return toStringTree(contextTree, Arrays.asList(ruleNames)); } diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/ParserValidator.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserValidator.java similarity index 87% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/ParserValidator.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserValidator.java index a7e19e1c9..2f0ec1371 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/ParserValidator.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/ParserValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -52,7 +52,7 @@ public class ParserValidator { public class UriLexerTrace extends UriLexer { ParserValidator parserValidator = null; - public UriLexerTrace(ParserValidator parserValidator, ANTLRInputStream antlrInputStream) { + public UriLexerTrace(final ParserValidator parserValidator, final ANTLRInputStream antlrInputStream) { super(antlrInputStream); this.parserValidator = parserValidator; } @@ -80,10 +80,10 @@ public class ParserValidator { } @Override - public void pushMode(int m) { - String out = UriLexer.modeNames[this._mode] + "-->"; + public void pushMode(final int m) { + String out = UriLexer.modeNames[_mode] + "-->"; super.pushMode(m); - out += UriLexer.modeNames[this._mode]; + out += UriLexer.modeNames[_mode]; if (parserValidator.logLevel > 1) { System.out.print(out + " "); } @@ -93,9 +93,9 @@ public class ParserValidator { @Override public int popMode() { - String out = UriLexer.modeNames[this._mode] + "-->"; + String out = UriLexer.modeNames[_mode] + "-->"; int m = super.popMode(); - out += UriLexer.modeNames[this._mode]; + out += UriLexer.modeNames[_mode]; if (parserValidator.logLevel > 1) { System.out.print(out + " "); @@ -121,7 +121,7 @@ public class ParserValidator { // private int lexerLogLevel = 0; - public ParserValidator run(String uri) { + public ParserValidator run(final String uri) { input = uri; if (lexerLogLevel > 0) { (new TokenValidator()).log(lexerLogLevel).run(input); @@ -146,7 +146,7 @@ public class ParserValidator { return this; } - public ParserValidator log(int logLevel) { + public ParserValidator log(final int logLevel) { this.logLevel = logLevel; return this; } @@ -183,7 +183,7 @@ public class ParserValidator { return this; } - public ParserValidator isText(String expected) { + public ParserValidator isText(final String expected) { // make sure that there are no exceptions assertEquals(null, curException); assertEquals(0, exceptions.size()); @@ -193,7 +193,7 @@ public class ParserValidator { return this; } - public ParserValidator isExType(Class exClass) { + public ParserValidator isExType(final Class exClass) { assertEquals(exClass, curException.getClass()); return this; } @@ -279,13 +279,14 @@ public class ParserValidator { private static class ErrorCollector implements ANTLRErrorListener { ParserValidator tokenValidator; - public ErrorCollector(ParserValidator tokenValidator) { + public ErrorCollector(final ParserValidator tokenValidator) { this.tokenValidator = tokenValidator; } @Override - public void syntaxError(Recognizer recognizer, Object offendingSymbol, int line, int charPositionInLine, - String msg, RecognitionException e) { + public void syntaxError(final Recognizer recognizer, final Object offendingSymbol, final int line, + final int charPositionInLine, + final String msg, final RecognitionException e) { tokenValidator.exceptions.add(e); trace(recognizer, offendingSymbol, line, charPositionInLine, msg, e); @@ -294,8 +295,9 @@ public class ParserValidator { } @Override - public void reportAmbiguity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, boolean exact, - BitSet ambigAlts, ATNConfigSet configs) { + public void reportAmbiguity(final Parser recognizer, final DFA dfa, final int startIndex, final int stopIndex, + final boolean exact, + final BitSet ambigAlts, final ATNConfigSet configs) { if (!tokenValidator.allowAmbiguity) { System.out.println("reportAmbiguity " + @@ -311,8 +313,9 @@ public class ParserValidator { } @Override - public void reportAttemptingFullContext(Parser recognizer, DFA dfa, int startIndex, int stopIndex, - BitSet conflictingAlts, ATNConfigSet configs) { + public void reportAttemptingFullContext(final Parser recognizer, final DFA dfa, final int startIndex, + final int stopIndex, + final BitSet conflictingAlts, final ATNConfigSet configs) { // The grammar should be written in order to avoid attempting a full context parse because its negative // impact on the performance, so trace and stop here @@ -325,8 +328,9 @@ public class ParserValidator { } @Override - public void reportContextSensitivity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, int prediction, - ATNConfigSet configs) { + public void reportContextSensitivity(final Parser recognizer, final DFA dfa, final int startIndex, + final int stopIndex, final int prediction, + final ATNConfigSet configs) { if (!tokenValidator.allowContextSensitifity) { printStack(recognizer); fail("reportContextSensitivity"); @@ -335,7 +339,7 @@ public class ParserValidator { } } - private void printStack(Parser recognizer) { + private void printStack(final Parser recognizer) { List stack = ((Parser) recognizer).getRuleInvocationStack(); Collections.reverse(stack); @@ -382,7 +386,7 @@ public class ParserValidator { return this; } - public ParserValidator exAt(int index) { + public ParserValidator exAt(final int index) { try { // curWeakException = exceptions.get(index); } catch (IndexOutOfBoundsException ex) { @@ -391,7 +395,7 @@ public class ParserValidator { return this; } - public ParserValidator lexerLog(int i) { + public ParserValidator lexerLog(final int i) { lexerLogLevel = i; return this; } diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TokenValidator.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenValidator.java similarity index 77% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TokenValidator.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenValidator.java index 7070651b1..32410ff48 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TokenValidator.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenValidator.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -46,7 +46,7 @@ public class TokenValidator { private int mode; - public TokenValidator run(String uri) { + public TokenValidator run(final String uri) { input = uri; exceptions.clear(); tokens = parseInput(uri); @@ -81,17 +81,17 @@ public class TokenValidator { return this; } - public TokenValidator log(int logLevel) { + public TokenValidator log(final int logLevel) { this.logLevel = logLevel; return this; } - public TokenValidator isText(String expected) { + public TokenValidator isText(final String expected) { assertEquals(expected, curToken.getText()); return this; } - public TokenValidator isAllText(String expected) { + public TokenValidator isAllText(final String expected) { String tmp = ""; for (Token curToken : tokens) { @@ -116,13 +116,13 @@ public class TokenValidator { return this; } - public TokenValidator isType(int expected) { + public TokenValidator isType(final int expected) { // assertEquals(UriLexer.tokenNames[expected], UriLexer.tokenNames[curToken.getType()]); assertEquals(UriLexer.tokenNames[expected], UriLexer.tokenNames[curToken.getType()]); return this; } - public TokenValidator isExType(Class exClass) { + public TokenValidator isExType(final Class exClass) { assertEquals(exClass, curException.getClass()); return this; } @@ -130,7 +130,7 @@ public class TokenValidator { private List parseInput(final String input) { ANTLRInputStream inputStream = new ANTLRInputStream(input); - UriLexer lexer = new TestUriLexer(this,inputStream, mode); + UriLexer lexer = new TestUriLexer(this, inputStream, mode); // lexer.setInSearch(searchMode); // lexer.removeErrorListeners(); lexer.addErrorListener(new ErrorCollector(this)); @@ -166,7 +166,7 @@ public class TokenValidator { return this; } - public TokenValidator at(int index) { + public TokenValidator at(final int index) { try { curToken = tokens.get(index); } catch (IndexOutOfBoundsException ex) { @@ -175,7 +175,7 @@ public class TokenValidator { return this; } - public TokenValidator exAt(int index) { + public TokenValidator exAt(final int index) { try { curException = exceptions.get(index); } catch (IndexOutOfBoundsException ex) { @@ -184,32 +184,31 @@ public class TokenValidator { return this; } - private static class TestUriLexer extends UriLexer { private TokenValidator validator; - public TestUriLexer(TokenValidator validator, CharStream input, int mode) { + public TestUriLexer(final TokenValidator validator, final CharStream input, final int mode) { super(input); super.mode(mode); this.validator = validator; } @Override - public void pushMode(int m) { + public void pushMode(final int m) { if (validator.logLevel > 0) { System.out.println("OnMode" + ": " + UriLexer.modeNames[m]); } super.pushMode(m); - + } @Override public int popMode() { - int m = super.popMode(); + int m = super.popMode(); if (validator.logLevel > 0) { System.out.println("OnMode" + ": " + UriLexer.modeNames[m]); } - + return m; } @@ -218,37 +217,41 @@ public class TokenValidator { private static class ErrorCollector implements ANTLRErrorListener { TokenValidator tokenValidator; - public ErrorCollector(TokenValidator tokenValidator) { + public ErrorCollector(final TokenValidator tokenValidator) { this.tokenValidator = tokenValidator; } @Override - public void syntaxError(Recognizer recognizer, Object offendingSymbol, int line, int charPositionInLine, - String msg, RecognitionException e) { + public void syntaxError(final Recognizer recognizer, final Object offendingSymbol, final int line, + final int charPositionInLine, + final String msg, final RecognitionException e) { tokenValidator.exceptions.add(e); } @Override - public void reportAmbiguity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, boolean exact, - BitSet ambigAlts, ATNConfigSet configs) { + public void reportAmbiguity(final Parser recognizer, final DFA dfa, final int startIndex, final int stopIndex, + final boolean exact, + final BitSet ambigAlts, final ATNConfigSet configs) { fail("reportAmbiguity"); } @Override - public void reportAttemptingFullContext(Parser recognizer, DFA dfa, int startIndex, int stopIndex, - BitSet conflictingAlts, ATNConfigSet configs) { + public void reportAttemptingFullContext(final Parser recognizer, final DFA dfa, final int startIndex, + final int stopIndex, + final BitSet conflictingAlts, final ATNConfigSet configs) { fail("reportAttemptingFullContext"); } @Override - public void reportContextSensitivity(Parser recognizer, DFA dfa, int startIndex, int stopIndex, int prediction, - ATNConfigSet configs) { + public void reportContextSensitivity(final Parser recognizer, final DFA dfa, final int startIndex, + final int stopIndex, final int prediction, + final ATNConfigSet configs) { fail("reportContextSensitivity"); } } - public void globalMode(int mode) { + public void globalMode(final int mode) { this.mode = mode; } diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TokenWriter.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenWriter.java similarity index 67% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TokenWriter.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenWriter.java index b06fcf707..ee9efbdcf 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TokenWriter.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TokenWriter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * L icensed to the Apache Software Foundation (ASF) under one + * L icensed 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 @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import org.antlr.v4.runtime.ParserRuleContext; import org.antlr.v4.runtime.tree.ErrorNode; @@ -26,31 +26,33 @@ import org.antlr.v4.runtime.tree.TerminalNode; public class TokenWriter implements ParseTreeListener { @Override - public void visitTerminal(TerminalNode node) { - /*String out = String.format("%1$-" + 20 + "s", node.getText()); ; - int tokenType = node.getSymbol().getType(); - if (tokenType == -1 ) { - out += "-1/EOF"; - } else { - out += UriLexer.tokenNames[tokenType]; - } - System.out.println(out); */ + public void visitTerminal(final TerminalNode node) { + /* + * String out = String.format("%1$-" + 20 + "s", node.getText()); ; + * int tokenType = node.getSymbol().getType(); + * if (tokenType == -1 ) { + * out += "-1/EOF"; + * } else { + * out += UriLexer.tokenNames[tokenType]; + * } + * System.out.println(out); + */ } @Override - public void visitErrorNode(ErrorNode node) { + public void visitErrorNode(final ErrorNode node) { // TODO Auto-generated method stub } @Override - public void enterEveryRule(ParserRuleContext ctx) { + public void enterEveryRule(final ParserRuleContext ctx) { // TODO Auto-generated method stub } @Override - public void exitEveryRule(ParserRuleContext ctx) { + public void exitEveryRule(final ParserRuleContext ctx) { // TODO Auto-generated method stub } diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TraceErrorHandler.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TraceErrorHandler.java similarity index 97% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TraceErrorHandler.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TraceErrorHandler.java index ae5a5b47e..4d218cac4 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/TraceErrorHandler.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/TraceErrorHandler.java @@ -16,13 +16,11 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import java.util.Collections; import java.util.List; - - import org.antlr.v4.runtime.BaseErrorListener; import org.antlr.v4.runtime.Parser; import org.antlr.v4.runtime.RecognitionException; diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/UriResourcePathValidator.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriResourcePathValidator.java similarity index 74% rename from odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/UriResourcePathValidator.java rename to odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriResourcePathValidator.java index 5a288aae7..b6a45bbd1 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/testutil/UriResourcePathValidator.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/odata4/producer/core/testutil/UriResourcePathValidator.java @@ -16,35 +16,35 @@ * specific language governing permissions and limitations * under the License. ******************************************************************************/ -package org.apache.olingo.producer.core.testutil; +package org.apache.olingo.odata4.producer.core.testutil; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.apache.olingo.commons.api.edm.Edm; -import org.apache.olingo.producer.api.uri.UriInfoKind; -import org.apache.olingo.producer.api.uri.UriPathInfoKind; -import org.apache.olingo.producer.core.uri.UriInfoImpl; -import org.apache.olingo.producer.core.uri.UriPathInfoImpl; -import org.apache.olingo.producer.core.uri.UriParserImpl; +import org.apache.olingo.odata4.commons.api.edm.Edm; +import org.apache.olingo.odata4.producer.api.uri.UriInfoKind; +import org.apache.olingo.odata4.producer.api.uri.UriPathInfoKind; +import org.apache.olingo.odata4.producer.core.uri.UriInfoImpl; +import org.apache.olingo.odata4.producer.core.uri.UriParserImpl; +import org.apache.olingo.odata4.producer.core.uri.UriPathInfoImpl; public class UriResourcePathValidator { UriInfoImpl uriInfo = null; UriPathInfoImpl uriPathInfo = null; // last private Edm edm; - public UriResourcePathValidator setEdm(Edm edm) { + public UriResourcePathValidator setEdm(final Edm edm) { this.edm = edm; return this; } - public UriResourcePathValidator run(String uri) { + public UriResourcePathValidator run(final String uri) { uriInfo = parseUri(uri); last(); return this; } - public UriResourcePathValidator isUriPathInfoKind(UriPathInfoKind infoType) { + public UriResourcePathValidator isUriPathInfoKind(final UriPathInfoKind infoType) { assertNotNull(uriPathInfo); assertEquals(infoType, uriPathInfo.getKind()); @@ -63,7 +63,7 @@ public class UriResourcePathValidator { return this; } - public UriResourcePathValidator at(int index) { + public UriResourcePathValidator at(final int index) { try { // uriPathInfo = uriInfo.getUriPathInfo(index); } catch (IndexOutOfBoundsException ex) { @@ -81,7 +81,7 @@ public class UriResourcePathValidator { return this; } - public void isKind(UriInfoKind batch) { + public void isKind(final UriInfoKind batch) { assertEquals(batch, uriInfo.getKind()); } diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestLexer.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestLexer.java index faa417845..6fb9f0872 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestLexer.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestLexer.java @@ -18,7 +18,8 @@ ******************************************************************************/ package org.apache.olingo.producer.core.uri.antlr; -import org.apache.olingo.producer.core.testutil.TokenValidator; +import org.antlr.v4.runtime.Lexer; +import org.apache.olingo.odata4.producer.core.testutil.TokenValidator; import org.junit.Test; public class TestLexer { @@ -32,10 +33,6 @@ public class TestLexer { private static final String cOTHER_DELIMS = "!()*+,;"; private static final String cSUB_DELIMS = "$&'=" + cOTHER_DELIMS; - private static final String cQCHAR_NO_AMP = cUNRESERVED + cPCT_ENCODED + cOTHER_DELIMS + ":@/?$'="; - // private static final String cQCHAR_NO_AMP_EQ = cUNRESERVED + cPCT_ENCODED + cOTHER_DELIMS + ":@/?$'"; - // private static final String cQCHAR_NO_AMP_EQ_AT_DOLLAR = cUNRESERVED + cPCT_ENCODED + cOTHER_DELIMS + ":/?'"; - // private static final String cPCTENCODEDnoSQUOTE = "%65%66%67"; // private static final String cPCHARnoSQUOTE = cUNRESERVED + cPCTENCODEDnoSQUOTE + cOTHER_DELIMS + "$&=:@"; @@ -43,21 +40,13 @@ public class TestLexer { private static final String cQCHAR_UNESCAPED = cUNRESERVED + cPCT_ENCODED_UNESCAPED + cOTHER_DELIMS + ":@/?$'="; - // QCHAR_NO_AMP_DQUOTE : QCHAR_UNESCAPED | ESCAPE ( ESCAPE | QUOTATION_MARK ); - private static final String cQCHAR_NO_AMP_DQUOTE = cQCHAR_UNESCAPED + "\\\\\\\""; - - private static final String cQCHAR_JSON_SPECIAL = " :{}[]"; - - private static final String cESCAPE = "\\"; - private static final String cQUOTATION_MARK = "\""; - public TestLexer() { test = new TokenValidator(); } - @Test + @Test public void test() { - test.globalMode(UriLexer.DEFAULT_MODE); + test.globalMode(Lexer.DEFAULT_MODE); test.run("ODI?$filter=geo.distance(geometry'SRID=0;Point(142.1 64.1)',geometry'SRID=0;Point(142.1 64.1)')"); // test.log(1).run("$filter='ABC'").isText("ABC").isType(UriLexer.STRING); // test.log(1).run("ODI?$filter=1 add 2 mul 3"); @@ -138,7 +127,7 @@ public class TestLexer { // ;------------------------------------------------------------------------------ @Test public void testQueryExpressions() { - test.globalMode(UriLexer.DEFAULT_MODE); + test.globalMode(Lexer.DEFAULT_MODE); // assertEquals("expected","actual"); test.run("$it").isText("$it").isType(UriLexer.IMPLICIT_VARIABLE_EXPR); @@ -266,7 +255,7 @@ public class TestLexer { @Test public void testLiteralDataValues() { - test.globalMode(UriLexer.DEFAULT_MODE); + test.globalMode(Lexer.DEFAULT_MODE); // null test.run("null").isInput().isType(UriLexer.NULLVALUE); diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestParser.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestParser.java index 5aec72c96..f1385a34f 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestParser.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/TestParser.java @@ -18,10 +18,7 @@ ******************************************************************************/ package org.apache.olingo.producer.core.uri.antlr; -import org.apache.olingo.producer.core.testutil.ParserValidator; - -import org.apache.olingo.producer.core.testutil.TokenValidator; - +import org.apache.olingo.odata4.producer.core.testutil.ParserValidator; import org.junit.Test; /** diff --git a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/UriTreeReaderTest.java b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/UriTreeReaderTest.java index edbc1e64f..8ca10f39c 100644 --- a/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/UriTreeReaderTest.java +++ b/odata4-lib/odata4-producer-core/src/test/java/org/apache/olingo/producer/core/uri/antlr/UriTreeReaderTest.java @@ -18,28 +18,27 @@ ******************************************************************************/ package org.apache.olingo.producer.core.uri.antlr; - -import org.apache.olingo.producer.api.uri.UriPathInfoKind; -import org.apache.olingo.producer.core.testutil.UriResourcePathValidator; - +import org.apache.olingo.odata4.producer.api.uri.UriPathInfoKind; +import org.apache.olingo.odata4.producer.core.testutil.UriResourcePathValidator; public class UriTreeReaderTest { UriResourcePathValidator test = null; public UriTreeReaderTest() { test = new UriResourcePathValidator(); - //test.setEdm(new EdmIm) + // test.setEdm(new EdmIm) } - /* - @Test - public void testShortUris() { - test.run("$batch").isKind(UriInfoKind.batch); - test.run("$all").isKind(UriInfoKind.all); - test.run("$crossjoin(abc)").isKind(UriInfoKind.crossjoin); - } - */ - //@Test + /* + * @Test + * public void testShortUris() { + * test.run("$batch").isKind(UriInfoKind.batch); + * test.run("$all").isKind(UriInfoKind.all); + * test.run("$crossjoin(abc)").isKind(UriInfoKind.crossjoin); + * } + */ + + // @Test public void testEntitySet() { test.run("Employees").isUriPathInfoKind(UriPathInfoKind.entitySet); @@ -55,49 +54,55 @@ public class UriTreeReaderTest { test.run("Employees/Location").isUriPathInfoKind(UriPathInfoKind.entitySet); test.run("Employees/Location/Country").isUriPathInfoKind(UriPathInfoKind.entitySet); } -/* - //@Test - public void testSingleton() { - test.run("Company").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.singleton); - }*/ -/* - //@Test - public void testActionImport() { - test.run("actionImport1").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.actionImport); - }*/ -/* - //@Test - public void testFunctionImport() { - test.run("MaximalAge").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.functioncall); - }*/ -/* - //@Test - public void testBoundFunctions() { - - test.run("Employees/RefScenario.bf_entity_set_rt_entity(NonBindingParameter='1')").isUriPathInfoKind( - UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); - test.run("Employees('1')/EmployeeName/RefScenario.bf_pprop_rt_entity_set()").isUriPathInfoKind( - UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); - test.run("Company/RefScenario.bf_singleton_rt_entity_set()('1')").isUriPathInfoKind( - UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); - // testUri("Company/RefScenario.bf_singleton_rt_entity_set()('1')/EmployeeName/" - // +"RefScenario.bf_pprop_rt_entity_set()", - // UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); - }*/ -/* - //@Test - public void testBoundActions() { - test.run("Employees('1')/RefScenario.ba_entity_rt_pprop") - .isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.boundActionImport); - test.run("Employees('1')/EmployeeName/RefScenario.ba_pprop_rt_entity_set").isUriPathInfoKind( - UriPathInfoImpl.UriPathInfoKind.boundActionImport); - }*/ -/* - //@Test - public void testNavigationFunction() { - test.run("Employees('1')/ne_Manager").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.navicationProperty); - test.run("Teams('1')/nt_Employees('1')").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.navicationProperty); - // testUri("Teams('1')/nt_Employees('1')/EmployeeName", UriPathInfoImpl.UriPathInfoKind.navicationProperty); - }*/ + /* + * //@Test + * public void testSingleton() { + * test.run("Company").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.singleton); + * } + */ + /* + * //@Test + * public void testActionImport() { + * test.run("actionImport1").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.actionImport); + * } + */ + /* + * //@Test + * public void testFunctionImport() { + * test.run("MaximalAge").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.functioncall); + * } + */ + /* + * //@Test + * public void testBoundFunctions() { + * + * test.run("Employees/RefScenario.bf_entity_set_rt_entity(NonBindingParameter='1')").isUriPathInfoKind( + * UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); + * test.run("Employees('1')/EmployeeName/RefScenario.bf_pprop_rt_entity_set()").isUriPathInfoKind( + * UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); + * test.run("Company/RefScenario.bf_singleton_rt_entity_set()('1')").isUriPathInfoKind( + * UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); + * // testUri("Company/RefScenario.bf_singleton_rt_entity_set()('1')/EmployeeName/" + * // +"RefScenario.bf_pprop_rt_entity_set()", + * // UriPathInfoImpl.UriPathInfoKind.boundFunctioncall); + * } + */ + /* + * //@Test + * public void testBoundActions() { + * test.run("Employees('1')/RefScenario.ba_entity_rt_pprop") + * .isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.boundActionImport); + * test.run("Employees('1')/EmployeeName/RefScenario.ba_pprop_rt_entity_set").isUriPathInfoKind( + * UriPathInfoImpl.UriPathInfoKind.boundActionImport); + * } + */ + /* + * //@Test + * public void testNavigationFunction() { + * test.run("Employees('1')/ne_Manager").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.navicationProperty); + * test.run("Teams('1')/nt_Employees('1')").isUriPathInfoKind(UriPathInfoImpl.UriPathInfoKind.navicationProperty); + * // testUri("Teams('1')/nt_Employees('1')/EmployeeName", UriPathInfoImpl.UriPathInfoKind.navicationProperty); + * } + */ }