[OLINGO-1004] Remove microsoft from Apache Olingo package name
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java b/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java
index 42626b5..04e152c 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/OpenTypeTestITCase.java
@@ -34,13 +34,13 @@
import org.apache.olingo.commons.api.format.ContentType;
import org.apache.olingo.ext.proxy.api.annotations.EntityType;
import org.apache.olingo.fit.proxy.opentype.Service;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.DefaultContainer;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.AccountInfo;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Color;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.DefaultContainer;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.AccountInfo;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Color;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.IndexedRow;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Row;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowIndex;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java
index d6e1c6e..04d5ef0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/Service.java
@@ -26,12 +26,12 @@
import org.apache.olingo.commons.api.edm.constants.ODataServiceVersion;
import org.apache.olingo.ext.proxy.AbstractService;
import org.apache.olingo.ext.proxy.api.AbstractTerm;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.AccountInfo;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Color;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.ContactDetails;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.IndexedRow;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.AccountInfo;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Color;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.ContactDetails;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.IndexedRow;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Row;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowIndex;
public class Service<C extends EdmEnabledODataClient> extends AbstractService<C> {
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java
deleted file mode 100644
index 26254f9..0000000
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
-
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/DefaultContainer.java
similarity index 95%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/DefaultContainer.java
index 09bba09..8febe7e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/DefaultContainer.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/DefaultContainer.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice;
// CHECKSTYLE:OFF (Maven checkstyle)
import java.io.InputStream;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/Row.java
similarity index 75%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/Row.java
index 6f230ff..2f472eb 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/Row.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowCollection;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowCollection;
// CHECKSTYLE:ON (Maven checkstyle)
@@ -28,9 +28,9 @@
container = "Microsoft.Test.OData.Services.OpenTypesServiceV4.DefaultContainer")
public interface Row
extends
- org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row, RowCollection>,
+ org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Row, RowCollection>,
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<Row>,
- AbstractEntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.Row, java.util.UUID, RowCollection> {
+ AbstractEntitySet<org.apache.olingo.fit.proxy.opentype.opentypesservice.types.Row, java.util.UUID, RowCollection> {
Operations operations();
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/RowIndex.java
similarity index 74%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/RowIndex.java
index cdc20c1..900219b 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/RowIndex.java
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractEntitySet;
-import org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndexCollection;
+import org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowIndexCollection;
// CHECKSTYLE:ON (Maven checkstyle)
@@ -28,9 +28,9 @@
container = "Microsoft.Test.OData.Services.OpenTypesServiceV4.DefaultContainer")
public interface RowIndex
extends
- org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex, RowIndexCollection>,
+ org.apache.olingo.ext.proxy.api.EntitySet<org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowIndex, RowIndexCollection>,
org.apache.olingo.ext.proxy.api.StructuredCollectionQuery<RowIndex>,
- AbstractEntitySet<org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types.RowIndex, java.lang.Integer, RowIndexCollection> {
+ AbstractEntitySet<org.apache.olingo.fit.proxy.opentype.opentypesservice.types.RowIndex, java.lang.Integer, RowIndexCollection> {
Operations operations();
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/package-info.java
similarity index 89%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/package-info.java
index 55fb49b..b32d6c2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/package-info.java
@@ -16,5 +16,5 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfo.java
similarity index 96%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfo.java
index 0c28783..8936a4d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfo.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoCollection.java
similarity index 93%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoCollection.java
index 5c6abad..f77336d 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import java.util.Collection;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
similarity index 92%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
index 746593c..a672916 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoCollectionComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoComposableInvoker.java
similarity index 95%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoComposableInvoker.java
index d4e186f..60d5bed 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/AccountInfoComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/AccountInfoComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/Color.java
similarity index 93%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/Color.java
index 0594588..538cb28 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Color.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/Color.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.commons.api.edm.EdmPrimitiveTypeKind;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetails.java
similarity index 98%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetails.java
index 3772b0f..f601bb0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetails.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetails.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.Annotatable;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsCollection.java
similarity index 93%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsCollection.java
index 035c118..b4b9f3f 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import java.util.Collection;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
similarity index 92%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
index d77451a..37cc9aa 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsCollectionComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsComposableInvoker.java
similarity index 98%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsComposableInvoker.java
index c55eec1..45aba50 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/ContactDetailsComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/ContactDetailsComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRow.java
similarity index 95%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRow.java
index f2618f2..ffb4da9 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRow.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRow.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
import java.util.concurrent.Future;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowCollection.java
similarity index 93%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowCollection.java
index 51ea58b..7a6b3f3 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import java.util.Collection;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
similarity index 92%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
index ee64c02..07ff45e 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowCollectionComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowComposableInvoker.java
similarity index 94%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowComposableInvoker.java
index 56d9712..14bd321 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/IndexedRowComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/IndexedRowComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/Row.java
similarity index 95%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/Row.java
index eb5a3cc..a0a8b83 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/Row.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/Row.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowCollection.java
similarity index 93%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowCollection.java
index c754aed..4d323c4 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import java.util.Collection;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowCollectionComposableInvoker.java
similarity index 91%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowCollectionComposableInvoker.java
index c3713a7..4d6eaa6 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowCollectionComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowCollectionComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowComposableInvoker.java
similarity index 94%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowComposableInvoker.java
index f77f079..c5f8df5 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndex.java
similarity index 96%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndex.java
index eee12de..59c4fb1 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndex.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndex.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexCollection.java
similarity index 93%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexCollection.java
index c0dae50..9a03027 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollection.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexCollection.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import java.util.Collection;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexCollectionComposableInvoker.java
similarity index 92%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexCollectionComposableInvoker.java
index cb4f23f..14dc1ec 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexCollectionComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexCollectionComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexComposableInvoker.java
similarity index 95%
rename from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java
rename to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexComposableInvoker.java
index 52e3306..2f425e2 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/types/RowIndexComposableInvoker.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/RowIndexComposableInvoker.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice.types;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
// CHECKSTYLE:OFF (Maven checkstyle)
import org.apache.olingo.ext.proxy.api.AbstractOpenType;
diff --git a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/package-info.java
similarity index 89%
copy from fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
copy to fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/package-info.java
index 55fb49b..c9a4bc0 100644
--- a/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/microsoft/test/odata/services/opentypesservice/package-info.java
+++ b/fit/src/test/java/org/apache/olingo/fit/proxy/opentype/opentypesservice/types/package-info.java
@@ -16,5 +16,5 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.olingo.fit.proxy.opentype.microsoft.test.odata.services.opentypesservice;
+package org.apache.olingo.fit.proxy.opentype.opentypesservice.types;
